From 020769f403ef4cf1880bd061b6db6b4f4028d3e4 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Dec 2016 18:23:54 +0000
Subject: Return 400/500 for some client/server errors.

---
 perllib/FixMyStreet/App/Controller/Auth.pm          | 13 +++++--------
 perllib/FixMyStreet/App/Controller/Dashboard.pm     |  4 ++--
 perllib/FixMyStreet/App/Controller/Questionnaire.pm |  9 ++++-----
 perllib/FixMyStreet/App/Controller/Reports.pm       |  7 +++----
 perllib/FixMyStreet/App/Controller/Root.pm          | 19 +++++++++++++++++--
 perllib/FixMyStreet/App/Controller/Tokens.pm        |  1 +
 t/app/controller/moderate.t                         |  3 ++-
 t/app/controller/questionnaire.t                    |  6 +++++-
 t/app/controller/report_updates.t                   |  6 ++++--
 9 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 40cd163cf..c448f8749 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -271,9 +271,8 @@ sub facebook_callback: Path('/auth/Facebook') : Args(0) {
         $access_token = $fb->get_access_token(code => $c->get_param('code'));
     };
     if ($@) {
-        ($c->stash->{message} = $@) =~ s/at [^ ]*Auth.pm.*//;
-        $c->stash->{template} = 'errors/generic.html';
-        $c->detach;
+        (my $message = $@) =~ s/at [^ ]*Auth.pm.*//;
+        $c->detach('/page_error_500_internal_error', [ $message ]);
     }
 
     # save this token in session
@@ -339,9 +338,8 @@ sub twitter_callback: Path('/auth/Twitter') : Args(0) {
         $twitter->request_access_token(verifier => $verifier);
     };
     if ($@) {
-        ($c->stash->{message} = $@) =~ s/at [^ ]*Auth.pm.*//;
-        $c->stash->{template} = 'errors/generic.html';
-        $c->detach;
+        (my $message = $@) =~ s/at [^ ]*Auth.pm.*//;
+        $c->detach('/page_error_500_internal_error', [ $message ]);
     }
 
     my $info = $twitter->verify_credentials();
@@ -527,8 +525,7 @@ sub check_csrf_token : Private {
 
 sub no_csrf_token : Private {
     my ($self, $c) = @_;
-    $c->stash->{message} = _('Unknown error');
-    $c->stash->{template} = 'errors/generic.html';
+    $c->detach('/page_error_400_bad_request', []);
 }
 
 =head2 sign_out
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index 9189b28e5..fbe5a2dc9 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -57,9 +57,9 @@ sub example : Local : Args(0) {
         }
     };
     if ($@) {
-        $c->stash->{message} = _("There was a problem showing this page. Please try again later.") . ' ' .
+        my $message = _("There was a problem showing this page. Please try again later.") . ' ' .
             sprintf(_('The error was: %s'), $@);
-        $c->stash->{template} = 'errors/generic.html';
+        $c->detach('/page_error_500_internal_error', [ $message ]);
     }
 }
 
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index 017a552db..1b338732b 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -36,9 +36,8 @@ sub check_questionnaire : Private {
     if ( $questionnaire->whenanswered ) {
         my $problem_url = $c->cobrand->base_url_for_report( $problem ) . $problem->url;
         my $contact_url = $c->uri_for( "/contact" );
-        $c->stash->{message} = sprintf(_("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"), $contact_url, $problem_url);
-        $c->stash->{template} = 'errors/generic.html';
-        $c->detach;
+        my $message = sprintf(_("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"), $contact_url, $problem_url);
+        $c->detach('/page_error_400_bad_request', [ $message ]);
     }
 
     unless ( $problem->is_visible ) {
@@ -86,8 +85,8 @@ Display couldn't locate problem error message
 sub missing_problem : Private {
     my ( $self, $c ) = @_;
 
-    $c->stash->{message} = _("I'm afraid we couldn't locate your problem in the database.\n");
-    $c->stash->{template} = 'errors/generic.html';
+    my $message = _("I'm afraid we couldn't locate your problem in the database.\n");
+    $c->detach('/page_error_400_bad_request', [ $message ]);
 }
 
 sub submit_creator_fixed : Private {
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 813c2052d..f2c43b5ee 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -76,13 +76,12 @@ sub index : Path : Args(0) {
         $c->stash->{open} = $j->{open};
     };
     if ($@) {
-        $c->stash->{message} = _("There was a problem showing the All Reports page. Please try again later.");
+        my $message = _("There was a problem showing the All Reports page. Please try again later.");
         if ($c->config->{STAGING_SITE}) {
-            $c->stash->{message} .= '</p><p>Perhaps the bin/update-all-reports script needs running. Use: bin/update-all-reports</p><p>'
+            $message .= '</p><p>Perhaps the bin/update-all-reports script needs running. Use: bin/update-all-reports</p><p>'
                 . sprintf(_('The error was: %s'), $@);
         }
-        $c->stash->{template} = 'errors/generic.html';
-        return;
+        $c->detach('/page_error_500_internal_error', [ $message ]);
     }
 
     # Down here so that error pages aren't cached.
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
index 3d4c6a1ba..1df249999 100644
--- a/perllib/FixMyStreet/App/Controller/Root.pm
+++ b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -103,9 +103,24 @@ sub page_error_410_gone : Private {
 
 sub page_error_403_access_denied : Private {
     my ( $self, $c, $error_msg ) = @_;
+    $c->detach('page_error', [ $error_msg || _("Sorry, you don't have permission to do that."), 403 ]);
+}
+
+sub page_error_400_bad_request : Private {
+    my ( $self, $c, $error_msg ) = @_;
+    $c->detach('page_error', [ $error_msg, 400 ]);
+}
+
+sub page_error_500_internal_error : Private {
+    my ( $self, $c, $error_msg ) = @_;
+    $c->detach('page_error', [ $error_msg, 500 ]);
+}
+
+sub page_error : Private {
+    my ($self, $c, $error_msg, $code) = @_;
     $c->stash->{template}  = 'errors/generic.html';
-    $c->stash->{message} = $error_msg || _("Sorry, you don't have permission to do that.");
-    $c->response->status(403);
+    $c->stash->{message} = $error_msg || _('Unknown error');
+    $c->response->status($code);
 }
 
 =head2 end
diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm
index da017c57f..a1b0c57ba 100644
--- a/perllib/FixMyStreet/App/Controller/Tokens.pm
+++ b/perllib/FixMyStreet/App/Controller/Tokens.pm
@@ -348,6 +348,7 @@ sub token_too_old : Private {
     my ( $self, $c ) = @_;
     $c->stash->{token_not_found} = 1;
     $c->stash->{template} = 'auth/token.html';
+    $c->response->status(400);
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/t/app/controller/moderate.t b/t/app/controller/moderate.t
index 0ccfcf2c2..3a3c7a708 100644
--- a/t/app/controller/moderate.t
+++ b/t/app/controller/moderate.t
@@ -67,7 +67,8 @@ subtest 'Auth' => sub {
         $mech->get_ok($REPORT_URL);
         $mech->content_lacks('Moderat');
 
-        $mech->get_ok('/contact?m=1&id=' . $report->id);
+        $mech->get('/contact?m=1&id=' . $report->id);
+        is $mech->res->code, 400;
         $mech->content_lacks('Good bad bad bad');
     };
 
diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t
index b05f74225..f42908a3e 100644
--- a/t/app/controller/questionnaire.t
+++ b/t/app/controller/questionnaire.t
@@ -87,16 +87,19 @@ foreach my $test (
         desc => 'User goes to questionnaire URL with a bad token',
         token_extra => 'BAD',
         content => "Sorry, that wasn&rsquo;t a valid link",
+        code => 400,
     },
     {
         desc => 'User goes to questionnaire URL for a now-hidden problem',
         state => 'hidden',
         content => "we couldn't locate your problem",
+        code => 400,
     },
     {
         desc => 'User goes to questionnaire URL for an already answered questionnaire',
         answered => \'current_timestamp',
         content => 'already answered this questionnaire',
+        code => 400,
     },
 ) {
     subtest $test->{desc} => sub {
@@ -106,7 +109,8 @@ foreach my $test (
         $questionnaire->update;
         (my $token = $token->token);
         $token .= $test->{token_extra} if $test->{token_extra};
-        $mech->get_ok("/Q/$token");
+        $mech->get("/Q/$token");
+        is $mech->res->code, $test->{code}, "Right status received";
         $mech->content_contains( $test->{content} );
         # Reset, no matter what test did
         $report->state( 'confirmed' );
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 5a88097fa..f7544f0a1 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -1829,7 +1829,8 @@ for my $test (
 subtest 'check have to be logged in for creator fixed questionnaire' => sub {
     $mech->log_out_ok();
 
-    $mech->get_ok( "/questionnaire/submit?problem=$report_id&reported=Yes" );
+    $mech->get( "/questionnaire/submit?problem=$report_id&reported=Yes" );
+    is $mech->res->code, 400, "got 400";
 
     $mech->content_contains( "I'm afraid we couldn't locate your problem in the database." )
 };
@@ -1838,7 +1839,8 @@ subtest 'check cannot answer other user\'s creator fixed questionnaire' => sub {
     $mech->log_out_ok();
     $mech->log_in_ok( $user2->email );
 
-    $mech->get_ok( "/questionnaire/submit?problem=$report_id&reported=Yes" );
+    $mech->get( "/questionnaire/submit?problem=$report_id&reported=Yes" );
+    is $mech->res->code, 400, "got 400";
 
     $mech->content_contains( "I'm afraid we couldn't locate your problem in the database." )
 };
-- 
cgit v1.2.3


From 37aaea540af32fd2c40f01471cb9374bc872aa45 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Dec 2016 16:13:02 +0000
Subject: Default inspect form to save with public update.

---
 t/app/controller/report_inspect.t       | 4 ++--
 templates/web/base/report/_inspect.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 56e6e957f..70b8c9586 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -57,7 +57,7 @@ FixMyStreet::override_config {
     };
 
     subtest "test basic inspect submission" => sub {
-        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Planned' } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Planned', save_inspected => undef } });
         $report->discard_changes;
         is $report->state, 'planned', 'report state changed';
         is $report->get_extra_metadata('traffic_information'), 'Yes', 'report data changed';
@@ -201,7 +201,7 @@ FixMyStreet::override_config {
         # which should cause it to be resent. We clear the host because
         # otherwise testing stays on host() above.
         $mech->clear_host;
-        $mech->submit_form(button => 'save', with_fields => { category => 'Horses' });
+        $mech->submit_form(button => 'save', with_fields => { category => 'Horses', save_inspected => undef, });
 
         $report->discard_changes;
         is $report->category, "Horses", "Report in correct category";
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index ccaa756c5..c83085e59 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -136,7 +136,7 @@
         [% IF permissions.report_inspect %]
           <p>
             <label class="label-containing-checkbox">
-              <input type="checkbox" name="save_inspected" value="1" class="js-toggle-public-update" [% 'checked' IF save_inspected %]>
+              <input type="checkbox" name="save_inspected" value="1" class="js-toggle-public-update" checked>
               [% loc('Save with a public update') %]
             </label>
           </p>
-- 
cgit v1.2.3


From e1f11deee821dd6540a76966731c94d31effa826 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 7 Dec 2016 14:14:22 +0000
Subject: Drop unneeded Cancel button on inspect form.

---
 templates/web/base/report/_inspect.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index c83085e59..ba11bbcbd 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -157,7 +157,6 @@
 
         <p>
           <input type="hidden" name="token" value="[% csrf_token %]">
-          <a class="btn" href="[% c.uri_for( '/report', problem.id ) %]">[% loc('Cancel') %]</a>
           <input class="btn btn-primary" type="submit" value="[% loc('Save changes') %]" data-value-original="[% loc('Save changes') %]" data-value-duplicate="[% loc('Save + close as duplicate') %]" name="save" />
         </p>
       </div>
-- 
cgit v1.2.3


From fddf7f9585e50a60acca01b84bc8f9cfc267dd0b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 25 Nov 2016 17:44:05 +0000
Subject: Add offline support of static files/fallback page.

Use a list to store JavaScript files, so it can be shared
between the HTML footer and the appcache manifest.
---
 perllib/FixMyStreet/App/Controller/Offline.pm      | 32 ++++++++++++++++
 perllib/FixMyStreet/App/View/Web.pm                |  5 ++-
 perllib/FixMyStreet/Cobrand/Base.pm                | 14 +++++++
 templates/web/angus/maps/fms.html                  | 22 +++++------
 templates/web/base/common_footer_tags.html         | 31 ++++-----------
 templates/web/base/common_scripts.html             | 44 ++++++++++++++++++++++
 templates/web/base/front/javascript.html           | 19 ++++++----
 templates/web/base/header.html                     | 19 ++++------
 templates/web/base/index.html                      |  2 +-
 templates/web/base/maps/bing.html                  | 16 ++++----
 templates/web/base/maps/fms.html                   | 18 ++++-----
 templates/web/base/maps/google-ol.html             | 14 ++++---
 templates/web/base/maps/google.html                | 10 +++--
 templates/web/base/maps/mapquest-attribution.html  | 17 ++++-----
 templates/web/base/maps/osm-streetview.html        | 17 ++++-----
 templates/web/base/maps/osm-toner-lite.html        | 19 +++++-----
 templates/web/base/maps/osm.html                   | 17 ++++-----
 templates/web/base/offline/appcache.html           |  8 ++++
 templates/web/base/offline/manifest.html           | 17 +++++++++
 templates/web/base/report/photo-js.html            |  6 +--
 templates/web/base/reports/index.html              |  6 +--
 templates/web/bristol/footer_extra_js.html         | 10 +++--
 templates/web/bristol/maps/bristol.html            | 14 ++++---
 templates/web/bromley/footer_extra_js.html         |  4 +-
 templates/web/bromley/maps/bromley.html            | 19 +++++-----
 .../fixmystreet-uk-councils/footer_extra_js.html   |  6 ++-
 templates/web/fixmystreet.com/about/posters.html   |  6 +--
 templates/web/fixmystreet.com/footer_extra_js.html |  8 ++--
 .../web/fixmystreet.com/front/javascript.html      | 19 ++++++----
 templates/web/oxfordshire/header.html              |  5 ++-
 templates/web/zurich/maps/zurich.html              | 16 ++++----
 web/cobrands/fixmystreet/offline.js                |  5 +++
 32 files changed, 296 insertions(+), 169 deletions(-)
 create mode 100644 perllib/FixMyStreet/App/Controller/Offline.pm
 create mode 100644 templates/web/base/common_scripts.html
 create mode 100644 templates/web/base/offline/appcache.html
 create mode 100644 templates/web/base/offline/manifest.html
 create mode 100644 web/cobrands/fixmystreet/offline.js

diff --git a/perllib/FixMyStreet/App/Controller/Offline.pm b/perllib/FixMyStreet/App/Controller/Offline.pm
new file mode 100644
index 000000000..9acb33f7e
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Offline.pm
@@ -0,0 +1,32 @@
+package FixMyStreet::App::Controller::Offline;
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller'; }
+
+=head1 NAME
+
+FixMyStreet::App::Controller::Offline - Catalyst Controller
+
+=head1 DESCRIPTION
+
+Offline pages Catalyst Controller.
+
+=head1 METHODS
+
+=cut
+
+sub manifest : Path("/offline/appcache.manifest") {
+    my ($self, $c) = @_;
+    $c->res->content_type('text/cache-manifest; charset=utf-8');
+    $c->res->header(Cache_Control => 'no-cache, no-store');
+}
+
+sub appcache : Path("/offline/appcache") {
+    my ($self, $c) = @_;
+    $c->detach('/page_error_404_not_found', []) if keys %{$c->req->params};
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index f0bcad0be..22387f5f6 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -140,7 +140,8 @@ sub escape_js {
 
 my %version_hash;
 sub version {
-    my ( $self, $c, $file ) = @_;
+    my ( $self, $c, $file, $url ) = @_;
+    $url ||= $file;
     _version_get_mtime($file);
     if ($version_hash{$file} && $file =~ /\.js$/) {
         # See if there's an auto.min.js version and use that instead if there is
@@ -149,7 +150,7 @@ sub version {
         $file = $file_min if $version_hash{$file_min} >= $version_hash{$file};
     }
     my $admin = $self->template->context->stash->{admin} ? FixMyStreet->config('ADMIN_BASE_URL') : '';
-    return "$admin$file?$version_hash{$file}";
+    return "$admin$url?$version_hash{$file}";
 }
 
 sub _version_get_mtime {
diff --git a/perllib/FixMyStreet/Cobrand/Base.pm b/perllib/FixMyStreet/Cobrand/Base.pm
index 5a9842233..a9eed0018 100644
--- a/perllib/FixMyStreet/Cobrand/Base.pm
+++ b/perllib/FixMyStreet/Cobrand/Base.pm
@@ -38,6 +38,20 @@ sub moniker {
     return $last_part;
 }
 
+=head2 asset_moniker
+
+    $moniker = $cobrand_class->asset_moniker();
+
+Same as moniker, except for the cobrand with the 'fixmystreet' moniker, when it
+returns 'fixmystreet.com', as to avoid confusion that's where its assets are.
+
+=cut
+
+sub asset_moniker {
+    my $self = shift;
+    return $self->moniker eq 'fixmystreet' ? 'fixmystreet.com' : $self->moniker;
+}
+
 =head2 is_default
 
     $bool = $cobrand->is_default();
diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html
index aed4d1764..1516ae05e 100644
--- a/templates/web/angus/maps/fms.html
+++ b/templates/web/angus/maps/fms.html
@@ -1,11 +1,11 @@
-[% map_js = BLOCK %]
-<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.angus.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script>
-<script src="[% version('/cobrands/angus/js.js') %]"></script>
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.angus.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-bing-ol.js'),
+    version('/js/map-fms.js'),
+    version('/cobrands/fixmystreet/assets.js'),
+    version('/cobrands/angus/js.js'),
+];
+map_html = INCLUDE maps/openlayers.html include_key = 1
+%]
diff --git a/templates/web/base/common_footer_tags.html b/templates/web/base/common_footer_tags.html
index 45872895b..01420c37d 100644
--- a/templates/web/base/common_footer_tags.html
+++ b/templates/web/base/common_footer_tags.html
@@ -1,28 +1,13 @@
-[% USE date %][% USE Math %]
-
 [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
 
-<script type="text/javascript" src="[% start %]/js/translation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
-<script type="text/javascript" src="[% version('/jslib/jquery-1.7.2.min.js') %]"></script>
+[% PROCESS 'common_scripts.html' %]
+
 <!--[if lte IE 9]>
-  <script type="text/javascript" src="[% version('/js/history.polyfill.min.js') %]"></script>
+  <script src="[% version('/js/history.polyfill.min.js') %]"></script>
 <![endif]-->
-<script type="text/javascript" src="[% version('/js/validation_rules.js') %]"></script>
-<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
-<script type="text/javascript" src="[% version('/js/dropzone.min.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/jquery.multi-select.js') %]"></script>
-
-<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
-<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
-
-[% map_js %]
-<script src="[% version('/cobrands/fixmystreet/map.js') %]"></script>
-
-[% IF admin %]
-  <script src="[% version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js') %]"></script>
-  <script type="text/javascript" src="[% version('/js/fixmystreet-admin.js') %]"></script>
+[% FOR script IN scripts ~%]
+    [% script = script.0 ? script : [ script ] ~%]
+    <script src="[% script.0 %]"
+        [%~ FOR attr IN script.1 %] [% attr.key %]="[% attr.value %]"[% END ~%]
+        ></script>
 [% END %]
-
-[% extra_js %]
-
-[% TRY %][% PROCESS 'footer_extra_js.html' %][% CATCH file %][% END %]
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
new file mode 100644
index 000000000..1d53f1d51
--- /dev/null
+++ b/templates/web/base/common_scripts.html
@@ -0,0 +1,44 @@
+[%
+
+USE date;
+USE Math;
+
+scripts = [];
+
+scripts.push(
+    start _ "/js/translation_strings." _ lang_code _ ".js?" _ Math.int( date.now / 3600 ),
+    version('/jslib/jquery-1.7.2.min.js'),
+    version('/js/validation_rules.js'),
+    version('/js/jquery.validate.min.js'),
+    version('/js/dropzone.min.js'),
+    version('/js/jquery.multi-select.js'),
+    version('/js/geo.min.js'),
+    version('/cobrands/fixmystreet/fixmystreet.js'),
+);
+
+FOR script IN map_js;
+    scripts.push(script);
+END;
+
+scripts.push(
+    version('/cobrands/fixmystreet/map.js'),
+    version('/cobrands/fixmystreet/offline.js'),
+);
+
+IF admin;
+    scripts.push(
+        version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js'),
+        version('/js/fixmystreet-admin.js'),
+    );
+END;
+
+FOR script IN extra_js;
+    scripts.push(script);
+END;
+
+TRY;
+    PROCESS 'footer_extra_js.html';
+CATCH file;
+END;
+
+~%]
diff --git a/templates/web/base/front/javascript.html b/templates/web/base/front/javascript.html
index 2795829a5..6b8e2a292 100644
--- a/templates/web/base/front/javascript.html
+++ b/templates/web/base/front/javascript.html
@@ -1,7 +1,12 @@
-[%# Assume using OpenStreetMap maps %]
-<script src="[% version('/js/yepnope.js') %]"></script>
-<script id="script_front" src="[% version('/cobrands/fixmystreet/front.js') %]"
-    data-scripts="
-        [%~ version('/js/OpenLayers/OpenLayers.fixmystreet.js') %],
-        [%~ version('/js/map-OpenLayers.js') %],
-        [%~ version('/js/map-OpenStreetMap.js') %]"></script>
+[%
+# Assume using OpenStreetMap maps
+map_js = [
+    version('/js/yepnope.js'),
+    [ version('/cobrands/fixmystreet/front.js'), {
+        id = 'script_front',
+        'data-scripts' = version('/js/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _
+            version('/js/map-OpenLayers.js') _ ',' _
+            version('/js/map-OpenStreetMap.js')
+    } ],
+]
+%]
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index c11e78b47..4e537a7ec 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -7,7 +7,10 @@
 <!--[if IE 7]>   <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
 <!--[if IE 8]>   <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
 <!--[if IE 9]>   <html class="no-js ie9"[% html_att %]><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]
+[% IF appcache ~%]
+ manifest="/offline/appcache.manifest"
+[%~ END %]><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
 
@@ -16,19 +19,11 @@
         <meta name="mobileoptimized" content="0">
 
         [% INCLUDE 'header_opengraph.html' %]
-        [%
-           # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
-           # it stylesheets under fixmystreet.com
-           IF c.cobrand.moniker == 'fixmystreet';
-               SET css_dir = 'fixmystreet.com';
-           ELSE;
-               SET css_dir = c.cobrand.moniker;
-           END %]
-        <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/base.css') %]">
-        <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
+        <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]">
+        <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]" media="(min-width:48em)">
         [% extra_css %]
         <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% version('/cobrands/' _ css_dir _ '/layout.css') %]">
+            <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]">
         <![endif]-->
 
         [% INCLUDE 'common_header_tags.html' %]
diff --git a/templates/web/base/index.html b/templates/web/base/index.html
index 0441b3efb..8cb127e6a 100644
--- a/templates/web/base/index.html
+++ b/templates/web/base/index.html
@@ -1,4 +1,4 @@
-[% map_js = PROCESS 'front/javascript.html' %]
+[% PROCESS 'front/javascript.html' %]
 
 [% pre_container_extra = PROCESS 'around/postcode_form.html' %]
 [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html
index 6af4c3562..59d012c4f 100644
--- a/templates/web/base/maps/bing.html
+++ b/templates/web/base/maps/bing.html
@@ -1,8 +1,8 @@
-[% map_js = BLOCK %]
-<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-bing-ol.js'),
+];
+map_html = INCLUDE maps/openlayers.html
+%]
diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html
index 03eb843da..e155ff778 100644
--- a/templates/web/base/maps/fms.html
+++ b/templates/web/base/maps/fms.html
@@ -1,9 +1,9 @@
-[% map_js = BLOCK %]
-<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-bing-ol.js'),
+    version('/js/map-fms.js'),
+];
+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 cccea5b24..e326bd713 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -1,9 +1,11 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3"></script>
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.google.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script>
-[% END %]
+[%
+map_js = [
+    "https://maps.googleapis.com/maps/api/js?v=3",
+    version('/js/OpenLayers/OpenLayers.google.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-google-ol.js'),
+]
+%]
 
 [% map_sub_links = BLOCK %]
 <a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a>
diff --git a/templates/web/base/maps/google.html b/templates/web/base/maps/google.html
index eeb4c9837..c86c757fb 100644
--- a/templates/web/base/maps/google.html
+++ b/templates/web/base/maps/google.html
@@ -1,4 +1,3 @@
-[% map_js = BLOCK %]
 <style>
 #map_box img {
     max-width: none;
@@ -7,9 +6,12 @@
     color: #000;
 }
 </style>
-<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript" src="[% version('/js/map-google.js') %]"></script>
-[% END %]
+[%
+map_js = [
+    "http://maps.googleapis.com/maps/api/js?sensor=false",
+    version('/js/map-google.js'),
+]
+%]
 
 [% map_html = BLOCK %]
 <script nonce="[% csp_nonce %]">
diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html
index ab4424cdd..e469901a8 100644
--- a/templates/web/base/maps/mapquest-attribution.html
+++ b/templates/web/base/maps/mapquest-attribution.html
@@ -1,9 +1,8 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-[% INCLUDE maps/openlayers.html %]
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-OpenStreetMap.js'),
+];
+map_html = INCLUDE maps/openlayers.html
+%]
diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html
index 2ff3b4723..dcf45d3b6 100644
--- a/templates/web/base/maps/osm-streetview.html
+++ b/templates/web/base/maps/osm-streetview.html
@@ -1,9 +1,8 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-streetview.js') %]"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-[% INCLUDE maps/openlayers.html %]
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-streetview.js'),
+];
+map_html = INCLUDE maps/openlayers.html
+%]
diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html
index 5e48f7569..6512eaf2c 100644
--- a/templates/web/base/maps/osm-toner-lite.html
+++ b/templates/web/base/maps/osm-toner-lite.html
@@ -1,10 +1,9 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-[% INCLUDE maps/openlayers.html %]
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    "https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0",
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-toner-lite.js'),
+];
+map_html = INCLUDE maps/openlayers.html
+%]
diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html
index ab4424cdd..e469901a8 100644
--- a/templates/web/base/maps/osm.html
+++ b/templates/web/base/maps/osm.html
@@ -1,9 +1,8 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script>
-[% END %]
-
-[% map_html = BLOCK %]
-[% INCLUDE maps/openlayers.html %]
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-OpenStreetMap.js'),
+];
+map_html = INCLUDE maps/openlayers.html
+%]
diff --git a/templates/web/base/offline/appcache.html b/templates/web/base/offline/appcache.html
new file mode 100644
index 000000000..766c27c1a
--- /dev/null
+++ b/templates/web/base/offline/appcache.html
@@ -0,0 +1,8 @@
+[% INCLUDE 'header.html' appcache = 1 bodyclass = "fullwidthpage" %]
+
+<h1>Internet glitch</h1>
+
+<p>Sorry, we don’t have a good enough connection to fetch that page, or the
+page wasn’t found or there was a server error. Please try again later.</p>
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/offline/manifest.html b/templates/web/base/offline/manifest.html
new file mode 100644
index 000000000..f5a9fddcc
--- /dev/null
+++ b/templates/web/base/offline/manifest.html
@@ -0,0 +1,17 @@
+CACHE MANIFEST
+
+[% PROCESS 'common_scripts.html' ~%]
+
+CACHE:
+[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]
+[% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]
+
+[% FOR script IN scripts ~%]
+    [%- script %]
+[% END %]
+
+NETWORK:
+*
+
+FALLBACK:
+/ [% version('../templates/web/base/offline/appcache.html', '/offline/appcache') %]
diff --git a/templates/web/base/report/photo-js.html b/templates/web/base/report/photo-js.html
index 05588d085..91b9930e7 100644
--- a/templates/web/base/report/photo-js.html
+++ b/templates/web/base/report/photo-js.html
@@ -1,6 +1,6 @@
 [% extra_css = BLOCK %]
     <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
 [% END %]
-[% extra_js = BLOCK %]
-    <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
-[% END %]
+[% extra_js = [
+    version('/js/fancybox/jquery.fancybox-1.3.4.pack.js')
+] %]
diff --git a/templates/web/base/reports/index.html b/templates/web/base/reports/index.html
index 4a7d5a9c9..b07227144 100755
--- a/templates/web/base/reports/index.html
+++ b/templates/web/base/reports/index.html
@@ -1,6 +1,6 @@
-[% extra_js = BLOCK %]
-    <script src="[% version('/js/jquery.fixedthead.js') %]"></script>
-[% END -%]
+[% extra_js = [
+    version('/js/jquery.fixedthead.js')
+] -%]
 [% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %]
 
 <h1>[% loc('All Reports') %]</h1>
diff --git a/templates/web/bristol/footer_extra_js.html b/templates/web/bristol/footer_extra_js.html
index 6ba5e3100..1cfcf00f6 100644
--- a/templates/web/bristol/footer_extra_js.html
+++ b/templates/web/bristol/footer_extra_js.html
@@ -1,4 +1,6 @@
-<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet/assets.js') %]"></script>
-<script src="[% version('/cobrands/bristol/js.js') %]"></script>
+[% scripts.push(
+    version('/js/OpenLayers.Projection.OrdnanceSurvey.js')
+    version('/cobrands/fixmystreet-uk-councils/js.js'),
+    version('/cobrands/fixmystreet/assets.js'),
+    version('/cobrands/bristol/js.js'),
+) %]
diff --git a/templates/web/bristol/maps/bristol.html b/templates/web/bristol/maps/bristol.html
index f49571a1d..08f6fba1c 100644
--- a/templates/web/bristol/maps/bristol.html
+++ b/templates/web/bristol/maps/bristol.html
@@ -1,9 +1,11 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.bristol.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-wmts-bristol.js') %]"></script>
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.bristol.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-wmts-base.js'),
+    version('/js/map-wmts-bristol.js'),
+]
+%]
 
 [% map_html = BLOCK %]
 [% INCLUDE maps/openlayers.html %]
diff --git a/templates/web/bromley/footer_extra_js.html b/templates/web/bromley/footer_extra_js.html
index 57066dbe8..ac03496a8 100644
--- a/templates/web/bromley/footer_extra_js.html
+++ b/templates/web/bromley/footer_extra_js.html
@@ -1 +1,3 @@
-<script src="[% version('/cobrands/bromley/a-z-nav.js') %]" charset="utf-8"></script>
+[% scripts.push(
+    version('/cobrands/bromley/a-z-nav.js'),
+) %]
diff --git a/templates/web/bromley/maps/bromley.html b/templates/web/bromley/maps/bromley.html
index aa5789c1c..c2ee0273f 100644
--- a/templates/web/bromley/maps/bromley.html
+++ b/templates/web/bromley/maps/bromley.html
@@ -1,9 +1,10 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers/OpenLayers.fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script>
-<script type="text/javascript" src="[% version('/cobrands/bromley/map.js') %]"></script>
-[% END %]
-
-[% map_html = INCLUDE maps/openlayers.html include_key = 1 %]
+[%
+map_js = [
+    version('/js/OpenLayers/OpenLayers.fixmystreet.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-bing-ol.js'),
+    version('/js/map-fms.js'),
+    version('/cobrands/bromley/map.js'),
+];
+map_html = INCLUDE maps/openlayers.html include_key = 1
+%]
diff --git a/templates/web/fixmystreet-uk-councils/footer_extra_js.html b/templates/web/fixmystreet-uk-councils/footer_extra_js.html
index 493902ef0..1e7a38f8a 100644
--- a/templates/web/fixmystreet-uk-councils/footer_extra_js.html
+++ b/templates/web/fixmystreet-uk-councils/footer_extra_js.html
@@ -1,2 +1,4 @@
-<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script>
+[% scripts.push(
+    version('/js/OpenLayers.Projection.OrdnanceSurvey.js')
+    version('/cobrands/fixmystreet-uk-councils/js.js'),
+) %]
diff --git a/templates/web/fixmystreet.com/about/posters.html b/templates/web/fixmystreet.com/about/posters.html
index 1a9a4400c..c4cf16cd4 100644
--- a/templates/web/fixmystreet.com/about/posters.html
+++ b/templates/web/fixmystreet.com/about/posters.html
@@ -1,6 +1,6 @@
-[% extra_js = BLOCK %]
-    <script src="[% version('/cobrands/fixmystreet.com/posters.js') %]"></script>
-[% END %]
+[% extra_js = [
+    version('/cobrands/fixmystreet.com/posters.js')
+] %]
 [% extra_css = BLOCK %]
     <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]">
 [% END %]
diff --git a/templates/web/fixmystreet.com/footer_extra_js.html b/templates/web/fixmystreet.com/footer_extra_js.html
index 0d1cca04d..d03aa8657 100644
--- a/templates/web/fixmystreet.com/footer_extra_js.html
+++ b/templates/web/fixmystreet.com/footer_extra_js.html
@@ -1,3 +1,5 @@
-<script src="[% version('/js/OpenLayers.Projection.OrdnanceSurvey.js') %]"></script>
-<script src="[% version('/js/jquery.cookie.min.js') %]"></script>
-<script src="[% version('/cobrands/fixmystreet.com/js.js') %]"></script>
+[% scripts.push(
+    version('/js/OpenLayers.Projection.OrdnanceSurvey.js'),
+    version('/js/jquery.cookie.min.js'),
+    version('/cobrands/fixmystreet.com/js.js'),
+) %]
diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html
index ac9faa309..baf7ebb64 100644
--- a/templates/web/fixmystreet.com/front/javascript.html
+++ b/templates/web/fixmystreet.com/front/javascript.html
@@ -1,7 +1,12 @@
-<script src="[% version('/js/yepnope.js') %]"></script>
-<script id="script_front" src="[% version('/cobrands/fixmystreet/front.js') %]"
-    data-scripts="
-        [%~ version('/js/OpenLayers/OpenLayers.fixmystreet.js') %],
-        [%~ version('/js/map-OpenLayers.js') %],
-        [%~ version('/js/map-bing-ol.js') %],
-        [%~ version('/js/map-fms.js') %]"></script>
+[%
+map_js = [
+    version('/js/yepnope.js'),
+    [ version('/cobrands/fixmystreet/front.js'), {
+        id = "script_front",
+        'data-scripts' = version('/js/OpenLayers/OpenLayers.fixmystreet.js') _ ',' _ 
+            version('/js/map-OpenLayers.js') _ ',' _
+            version('/js/map-bing-ol.js') _ ',' _
+            version('/js/map-fms.js')
+    } ],
+]
+%]
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 042222e1d..d8cb8d4bb 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -2,7 +2,10 @@
 <!--[if IE 7]>   <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
 <!--[if IE 8]>   <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
 <!--[if IE 9]>   <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"
+[% IF appcache ~%]
+ manifest="/offline/appcache.manifest"
+[%~ END %]><!--<![endif]-->
     <head>
         <meta name="viewport" content="initial-scale=1.0">
 
diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html
index 2f21c91a6..f85be4aef 100644
--- a/templates/web/zurich/maps/zurich.html
+++ b/templates/web/zurich/maps/zurich.html
@@ -1,10 +1,12 @@
-[% map_js = BLOCK %]
-<script type="text/javascript" src="[% version('/js/OpenLayers.2.11.zurich.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/OpenLayers.Projection.CH1903Plus.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-wmts-base.js') %]"></script>
-<script type="text/javascript" src="[% version('/js/map-wmts-zurich.js') %]"></script>
-[% END %]
+[%
+map_js = [
+    version('/js/OpenLayers.2.11.zurich.js'),
+    version('/js/OpenLayers.Projection.CH1903Plus.js'),
+    version('/js/map-OpenLayers.js'),
+    version('/js/map-wmts-base.js'),
+    version('/js/map-wmts-zurich.js'),
+]
+%]
 
 [% map_sub_links = BLOCK %]
     <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a>
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
new file mode 100644
index 000000000..4b3373029
--- /dev/null
+++ b/web/cobrands/fixmystreet/offline.js
@@ -0,0 +1,5 @@
+if (!$('#offline_list').length) {
+    if (window.applicationCache && window.localStorage) {
+        $(document.body).prepend('<iframe src="/offline/appcache" style="position:absolute;top:-999em;visibility:hidden"></iframe>');
+    }
+}
-- 
cgit v1.2.3


From 34f942d7881451e164431a3231774568421a00f5 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 29 Nov 2016 17:44:04 +0000
Subject: Store/show shortlisted reports offline.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This:

* On an online visit to /my/planned, caches all shortlisted reports,
  their images and static maps in localStorage, with progress banner;

* When a report is added/removed from the shortlist, caches/de-caches
  that report;

* When viewing a report page offline, shows that page from the cache
  if present (replacing the dynamic map with the cached static map, and
  replacing report images with their cached equivalents – it is a shame
  to duplicate, but we cannot rely on the browser cache having these images);

* When viewing another page offline, shows an error message but also the
  list of shortlisted reports that are cached (again, replacing their
  thumbnail images with the cached versions).
---
 templates/web/base/offline/appcache.html |   2 +
 templates/web/base/report/_item.html     |   3 +-
 templates/web/base/report/_main.html     |   2 +-
 web/cobrands/fixmystreet.com/base.scss   |  35 +---
 web/cobrands/fixmystreet/fixmystreet.js  |   3 +
 web/cobrands/fixmystreet/offline.js      | 276 ++++++++++++++++++++++++++++++-
 web/cobrands/oxfordshire/base.scss       |   1 +
 web/cobrands/sass/_top-banner.scss       |  49 ++++++
 8 files changed, 334 insertions(+), 37 deletions(-)
 create mode 100644 web/cobrands/sass/_top-banner.scss

diff --git a/templates/web/base/offline/appcache.html b/templates/web/base/offline/appcache.html
index 766c27c1a..6f701321a 100644
--- a/templates/web/base/offline/appcache.html
+++ b/templates/web/base/offline/appcache.html
@@ -5,4 +5,6 @@
 <p>Sorry, we don’t have a good enough connection to fetch that page, or the
 page wasn’t found or there was a server error. Please try again later.</p>
 
+<ul class="item-list item-list--reports" id="offline_list"></ul>
+
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 0f42b00ce..c3e88aed2 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -1,4 +1,5 @@
-<li class="item-list__item item-list--reports__item [% item_extra_class %]" data-report-id="[% problem.id | html %]">
+<li class="item-list__item item-list--reports__item [% item_extra_class %]"
+    data-report-id="[% problem.id | html %]" data-lastupdate="[% problem.lastupdate %]">
 <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">
     [% IF problem.photo %]
         <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 4de26535c..d5224f23e 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -5,7 +5,7 @@
 <a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]"
     class="problem-back js-back-to-report-list">[% loc('Back to all reports') %]</a>
 
-<div class="problem-header clearfix" problem-id="[% problem.id %]">
+<div class="problem-header clearfix" data-lastupdate="[% problem.lastupdate %]">
 
 [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %]
 <form method="post" action="/my/planned/change" id="planned_form" class="hidden-label-target">
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index 905f20f41..5b703c3d2 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -7,40 +7,7 @@
 @import "../sass/h5bp";
 @import "_colours";
 @import "../sass/base";
-
-.top_banner {
-    color: $primary_text;
-    background: $primary;
-    p {
-        margin: auto;
-        padding: 0.5em 2em;
-        max-width: 50em;
-        text-align: center;
-    }
-    a {
-        color: $primary_text;
-        text-decoration: underline;
-    }
-}
-
-.top_banner--donate {
-    background: #bef;
-}
-
-// The banner interferes with the map moving/placement on mobile, and the top
-// bar navigation on desktop (which both assume that .wrapper is at the top of
-// the page) so hide there for now
-.mappage .top_banner--donate {
-    display: none;
-}
-
-// This banner is only shown via JavaScript AJAX call
-.top_banner--country {
-    display: none;
-}
-.top_banner__close {
-    float: $right;
-}
+@import "../sass/top-banner";
 
 #site-logo {
   background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index cd3b127d6..cd2a066e3 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -316,6 +316,7 @@ $.extend(fixmystreet.set_up, {
             $change = $form.find("input[name='change']" ),
             $submit = $form.find("input[type='submit']" ),
             $labels = $('label[for="' + $submit.attr('id') + '"]'),
+            problemId = $form.find("input[name='id']").val(),
             data = $form.serialize() + '&ajax=1',
             changeValue,
             buttonLabel,
@@ -327,10 +328,12 @@ $.extend(fixmystreet.set_up, {
                 buttonLabel = $submit.data('label-remove');
                 buttonValue = $submit.data('value-remove');
                 $('.shortlisted-status').remove();
+                $(document).trigger('shortlist-add', problemId);
             } else if (data.outcome == 'remove') {
                 changeValue = "add";
                 buttonLabel = $submit.data('label-add');
                 buttonValue = $submit.data('value-add');
+                $(document).trigger('shortlist-remove', problemId);
             }
             $change.val(changeValue);
             $submit.val(buttonValue).attr('aria-label', buttonLabel);
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 4b3373029..23db5d472 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -1,5 +1,279 @@
-if (!$('#offline_list').length) {
+fixmystreet.offlineBanner = (function() {
+    var toCache = 0;
+    var cachedSoFar = 0;
+
+    return {
+        make: function(offline) {
+            var banner = ['<div class="top_banner top_banner--offline"><p><span id="offline_saving">'];
+            banner.push('</span></p></div>');
+            banner = $(banner.join(''));
+            banner.prependTo('.content');
+            banner.hide();
+        },
+        startProgress: function(l) {
+            $('.top_banner--offline').slideDown();
+            toCache = l;
+            $('#offline_saving').html('Saving reports offline &ndash; <span>0</span>/' + toCache + '.');
+        },
+        progress: function() {
+            cachedSoFar += 1;
+            if (cachedSoFar === toCache) {
+                $('#offline_saving').text('Reports saved offline.');
+            } else {
+                $('#offline_saving span').text(cachedSoFar);
+            }
+        }
+    };
+})();
+
+fixmystreet.offlineData = (function() {
+    var data;
+
+    function getData() {
+        if (data === undefined) {
+            data = JSON.parse(localStorage.getItem('offlineData'));
+            if (!data) {
+                data = { cachedReports: {} };
+            }
+        }
+        return data;
+    }
+
+    function saveData() {
+        localStorage.setItem('offlineData', JSON.stringify(getData()));
+    }
+
+    return {
+        getCachedUrls: function() {
+            return Object.keys(getData().cachedReports);
+        },
+        isIndexed: function(url, lastupdate) {
+            if (lastupdate) {
+                return getData().cachedReports[url] === lastupdate;
+            }
+            return !!getData().cachedReports[url];
+        },
+        add: function(url, lastupdate) {
+            var data = getData();
+            data.cachedReports[url] = lastupdate || "-";
+            saveData();
+        },
+        remove: function(urls) {
+            var data = getData();
+            urls.forEach(function(url) {
+                delete data.cachedReports[url];
+            });
+            saveData();
+        }
+    };
+})();
+
+fixmystreet.cachet = (function(){
+    var urlsInProgress = {};
+
+    function cacheURL(url, type) {
+        urlsInProgress[url] = 1;
+
+        var ret;
+        if (type === 'image') {
+            ret = $.Deferred(function(deferred) {
+                var oReq = new XMLHttpRequest();
+                oReq.open("GET", url, true);
+                oReq.responseType = "blob";
+                oReq.onload = function(oEvent) {
+                    var blob = oReq.response;
+                    var reader = new window.FileReader();
+                    reader.readAsDataURL(blob);
+                    reader.onloadend = function() {
+                        localStorage.setItem(url, reader.result);
+                        delete urlsInProgress[url];
+                        deferred.resolve(blob);
+                    };
+                };
+                oReq.send();
+            });
+        } else {
+            ret = $.ajax(url).pipe(function(content, textStatus, jqXHR) {
+                localStorage.setItem(url, content);
+                delete urlsInProgress[url];
+                return content;
+            });
+        }
+        return ret;
+    }
+
+    function cacheReport(item) {
+        return cacheURL(item.url, 'html').pipe(function(html) {
+            var $reportPage = $(html);
+            var imagesToGet = [
+                item.url + '/map' // Static map image
+            ];
+            $reportPage.find('img').each(function(i, img) {
+                if (img.src.indexOf('/photo/') === -1 || fixmystreet.offlineData.isIndexed(img.src) || urlsInProgress[img.src]) {
+                    return;
+                }
+                imagesToGet.push(img.src);
+                imagesToGet.push(img.src.replace('.jpeg', '.fp.jpeg'));
+            });
+            var imagePromises = imagesToGet.map(function(url) {
+                return cacheURL(url, 'image');
+            });
+            return $.when.apply(undefined, imagePromises).pipe(function() {
+                fixmystreet.offlineBanner.progress();
+                fixmystreet.offlineData.add(item.url, item.lastupdate);
+            }, function() {
+                fixmystreet.offlineBanner.progress();
+                fixmystreet.offlineData.add(item.url, item.lastupdate);
+            });
+        });
+    }
+
+    // Cache a list of reports offline
+    // This fetches the HTML and any img elements in that HTML
+    function cacheReports(items) {
+        fixmystreet.offlineBanner.startProgress(items.length);
+        var promises = items.map(function(item) {
+            return cacheReport(item);
+        });
+        return $.when.apply(undefined, promises);
+    }
+
+    return {
+        cacheReports: cacheReports
+    };
+})();
+
+fixmystreet.offline = (function() {
+    function getReportsFromList() {
+        var reports = $('.item-list__item').map(function(i, li) {
+            var $li = $(li),
+                url = $li.find('a')[0].pathname,
+                lastupdate = $li.data('lastupdate');
+            return { 'url': url, 'lastupdate': lastupdate };
+        }).get();
+        return reports;
+    }
+
+    function updateCachedReports() {
+        var toCache = [];
+        var toRemove = [];
+        var shouldBeCached = {};
+
+        localStorage.setItem('/my/planned', $('.item-list').html());
+
+        getReportsFromList().forEach(function(item, i) {
+            if (!fixmystreet.offlineData.isIndexed(item.url, item.lastupdate)) {
+                toCache.push(item);
+            }
+            shouldBeCached[item.url] = 1;
+        });
+
+        fixmystreet.offlineData.getCachedUrls().forEach(function(url) {
+            if ( !shouldBeCached[url] ) {
+                toRemove.push(url);
+            }
+        });
+
+        if (toRemove[0]) {
+            removeReports(toRemove);
+        }
+        if (toCache[0]) {
+            fixmystreet.cachet.cacheReports(toCache);
+        }
+    }
+
+    // Remove a list of reports from the offline cache
+    function removeReports(urls) {
+        var pathsRemoved = [];
+        urls.forEach(function(url) {
+            var html = localStorage.getItem(url);
+            var $reportPage = $(html);
+            localStorage.removeItem(url + '/map');
+            $reportPage.find('img').each(function(i, img) {
+                if (img.src.indexOf('/photo/') === -1) {
+                    return;
+                }
+                localStorage.removeItem(img.src);
+                localStorage.removeItem(img.src.replace('.jpeg', '.fp.jpeg'));
+            });
+            localStorage.removeItem(url);
+        });
+        fixmystreet.offlineData.remove(urls);
+    }
+
+    function showReportFromCache(url) {
+        var html = localStorage.getItem(url);
+        if (!html) {
+            return false;
+        }
+        var map = localStorage.getItem(url + '/map');
+        var found = html.match(/<body[^>]*>[\s\S]*<\/body>/);
+        document.body.outerHTML = found[0];
+        $('#map_box').html('<img src="' + map + '">').css({ textAlign: 'center', height: 'auto' });
+        replaceImages('img');
+
+        $('.moderate-display.segmented-control, .shadow-wrap, #update_form, #report-cta, .mysoc-footer, .nav-wrapper').hide();
+
+        $('.js-back-to-report-list').attr('href', '/my/planned');
+
+        return true;
+    }
+
+    function replaceImages(selector) {
+        $(selector).each(function(i, img) {
+            if (img.src.indexOf('/photo/') > -1) {
+                var dataImg = localStorage.getItem(img.src);
+                if (dataImg) {
+                    img.src = dataImg;
+                }
+            }
+        });
+    }
+
+    return {
+        replaceImages: replaceImages,
+        showReportFromCache: showReportFromCache,
+        removeReports: removeReports,
+        updateCachedReports: updateCachedReports
+    };
+
+})();
+
+if ($('#offline_list').length) {
+    // We are OFFLINE
+    var success = false;
+    if (location.pathname.indexOf('/report') === 0) {
+        success = fixmystreet.offline.showReportFromCache(location.pathname);
+    }
+    if (!success) {
+        var html = localStorage.getItem('/my/planned');
+        if (html) {
+            $('#offline_list').before('<h2>Your offline reports</h2>');
+            $('#offline_list').html(html);
+            fixmystreet.offline.replaceImages('#offline_list img');
+        }
+    }
+    fixmystreet.offlineBanner.make(true);
+} else {
+    // Put the appcache manifest in a page in an iframe so that HTML pages
+    // aren't cached (thanks to Jake Archibald for documenting this!)
     if (window.applicationCache && window.localStorage) {
         $(document.body).prepend('<iframe src="/offline/appcache" style="position:absolute;top:-999em;visibility:hidden"></iframe>');
     }
+
+    fixmystreet.offlineBanner.make(false);
+
+    // On /my/planned, when online, cache all shortlisted
+    if (location.pathname === '/my/planned') {
+        fixmystreet.offline.updateCachedReports();
+    }
+
+    // Catch additions and removals from the shortlist
+    $(document).on('shortlist-add', function(e, id) {
+        var lastupdate = $('.problem-header').data('lastupdate');
+        fixmystreet.cachet.cacheReports([{ 'url': '/report/' + id, 'lastupdate': lastupdate }]);
+    });
+    $(document).on('shortlist-remove', function(e, id) {
+        fixmystreet.offline.removeReports(['/report/' + id]);
+    });
 }
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 955c341bf..34b7dc809 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -3,6 +3,7 @@
 @import "../sass/mixins";
 
 @import "../sass/base";
+@import "../sass/top-banner";
 
 #site-header {
   background: none;
diff --git a/web/cobrands/sass/_top-banner.scss b/web/cobrands/sass/_top-banner.scss
new file mode 100644
index 000000000..8677343c2
--- /dev/null
+++ b/web/cobrands/sass/_top-banner.scss
@@ -0,0 +1,49 @@
+.top_banner {
+    color: $primary_text;
+    background: $primary;
+    p {
+        margin: auto;
+        padding: 0.5em 2em;
+        max-width: 50em;
+        text-align: center;
+    }
+    a {
+        color: $primary_text;
+        text-decoration: underline;
+    }
+}
+
+.top_banner--donate {
+    background: #bef;
+}
+
+// The banner interferes with the map moving/placement on mobile, and the top
+// bar navigation on desktop (which both assume that .wrapper is at the top of
+// the page) so hide there for now
+.mappage .top_banner--donate {
+    display: none;
+}
+
+// This banner is only shown via JavaScript AJAX call
+.top_banner--country {
+    display: none;
+}
+
+.top_banner--offline {
+    position: fixed; left: 0; right: 0; top: 0; z-index: 100;
+    opacity: 0.9;
+    background: #c33;
+    color: #fff;
+}
+
+.top_banner--offline a {
+    color: #fff;
+}
+
+.top_banner--offline a:hover {
+    color: #000;
+}
+
+.top_banner__close {
+    float: $right;
+}
-- 
cgit v1.2.3


From 2abd85a6d9151f95c82656df9e6b8220e381ca03 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 1 Dec 2016 18:25:24 +0000
Subject: Add offline storing of inspect forms.

This allows the inspect form to be submitted when offline, with the data
saved in localStorage, the number of saved forms shown in the banner,
and the forms to be uploaded when back online.

It copes if you go back to a report after having submitted the form, and
if the back-online submission fails due to CSRF failure, retrying once
with a new token.
---
 perllib/FixMyStreet/App/Controller/Report.pm |   8 +-
 perllib/FixMyStreet/App/Controller/Root.pm   |   1 +
 templates/web/base/errors/generic.html       |   4 +
 web/cobrands/fixmystreet/offline.js          | 125 ++++++++++++++++++++++++++-
 4 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index f7ccddc70..481bc4ab8 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -385,10 +385,14 @@ sub inspect : Private {
             $problem->lastupdate( \'current_timestamp' );
             $problem->update;
             if ( defined($update_text) ) {
+                my $timestamp = \'current_timestamp';
+                if (my $saved_at = $c->get_param('saved_at')) {
+                    $timestamp = DateTime->from_epoch( epoch => $saved_at );
+                }
                 $problem->add_to_comments( {
                     text => $update_text,
-                    created => \'current_timestamp',
-                    confirmed => \'current_timestamp',
+                    created => $timestamp,
+                    confirmed => $timestamp,
                     user_id => $c->user->id,
                     name => $c->user->from_body->name,
                     state => 'confirmed',
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
index 1df249999..20a871b17 100644
--- a/perllib/FixMyStreet/App/Controller/Root.pm
+++ b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -108,6 +108,7 @@ sub page_error_403_access_denied : Private {
 
 sub page_error_400_bad_request : Private {
     my ( $self, $c, $error_msg ) = @_;
+    $c->forward('/auth/get_csrf_token');
     $c->detach('page_error', [ $error_msg, 400 ]);
 }
 
diff --git a/templates/web/base/errors/generic.html b/templates/web/base/errors/generic.html
index d0d1e2e00..241b310de 100755
--- a/templates/web/base/errors/generic.html
+++ b/templates/web/base/errors/generic.html
@@ -1,5 +1,9 @@
 [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Error') %]
 
+[% IF csrf_token ~%]
+<input type="hidden" name="token" value="[% csrf_token %]">
+[% END ~%]
+
 <div class="confirmation-header confirmation-header--failure">
     <h1>[% loc('Error') %]</h1>
     <p>[% message %]</p>
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 23db5d472..c875c9b84 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -2,13 +2,80 @@ fixmystreet.offlineBanner = (function() {
     var toCache = 0;
     var cachedSoFar = 0;
 
+    function formText() {
+        var num = fixmystreet.offlineData.getForms().length;
+        return num + ' form' + (num===1 ? '' : 's');
+    }
+
+    function onlineText() {
+        return 'You have <a id="oFN" href=""><span>' + formText() + '</span> saved to submit</a>.';
+    }
+
+    function offlineText() {
+        return 'You are offline \u2013 <span>' + formText() + '</span> saved.';
+    }
+
     return {
         make: function(offline) {
-            var banner = ['<div class="top_banner top_banner--offline"><p><span id="offline_saving">'];
+            var num = fixmystreet.offlineData.getForms().length;
+            var banner = ['<div class="top_banner top_banner--offline"><p><span id="offline_saving"></span> <span id="offline_forms">'];
+            if (offline || num > 0) {
+                banner.push(offline ? offlineText() : onlineText());
+            }
             banner.push('</span></p></div>');
             banner = $(banner.join(''));
             banner.prependTo('.content');
-            banner.hide();
+            if (!offline && num === 0) {
+                banner.hide();
+            }
+
+            window.addEventListener("offline", function(e) {
+                $('.top_banner--offline').slideDown();
+                $('#offline_forms').html(offlineText());
+            });
+
+            window.addEventListener("online", function(e) {
+                $('#offline_forms').html(onlineText());
+            });
+
+            function nextForm(DataOrJqXHR, textStatus, jqXHROrErrorThrown) {
+                fixmystreet.offlineData.shiftForm();
+                $(document).dequeue('postForm');
+            }
+
+            function postForm(url, data) {
+                return $.ajax({ url: url, data: data, type: 'POST' }).done(nextForm);
+            }
+
+            $(document).on('click', '#oFN', function(e) {
+                e.preventDefault();
+                fixmystreet.offlineData.getForms().forEach(function(form) {
+                    $(document).queue('postForm', function() {
+                        postForm(form[0], form[1]).fail(function(jqXHR) {
+                            if (jqXHR.status !== 400) {
+                                return nextForm();
+                            }
+                            // In case the request failed due to out-of-date CSRF token,
+                            // try once more with a new token given in the error response.
+                            var m = jqXHR.responseText.match(/name="token" value="([^"]*)"/);
+                            if (!m) {
+                                return nextForm();
+                            }
+                            var token = m[1];
+                            if (!token) {
+                                return nextForm();
+                            }
+                            var param = form[1].replace(/&token=[^&]*/, '&token=' + token);
+                            return postForm(form[0], param).fail(nextForm);
+                        });
+                    });
+                });
+                $(document).dequeue('postForm');
+            });
+        },
+        update: function() {
+            $('.top_banner--offline').slideDown();
+            $('#offline_forms span').text(formText());
         },
         startProgress: function(l) {
             $('.top_banner--offline').slideDown();
@@ -33,7 +100,7 @@ fixmystreet.offlineData = (function() {
         if (data === undefined) {
             data = JSON.parse(localStorage.getItem('offlineData'));
             if (!data) {
-                data = { cachedReports: {} };
+                data = { cachedReports: {}, forms: [] };
             }
         }
         return data;
@@ -44,6 +111,22 @@ fixmystreet.offlineData = (function() {
     }
 
     return {
+        getForms: function() {
+            return getData().forms;
+        },
+        addForm: function(action, formData) {
+            var forms = getData().forms;
+            if (!forms.length || formData != forms[forms.length - 1][1]) {
+                forms.push([action, formData]);
+                saveData();
+            }
+            fixmystreet.offlineBanner.update();
+        },
+        shiftForm: function(idx) {
+            getData().forms.shift();
+            saveData();
+            fixmystreet.offlineBanner.update();
+        },
         getCachedUrls: function() {
             return Object.keys(getData().cachedReports);
         },
@@ -216,6 +299,29 @@ fixmystreet.offline = (function() {
 
         $('.js-back-to-report-list').attr('href', '/my/planned');
 
+        // Refill form with saved data if there is any
+        var savedForm;
+        fixmystreet.offlineData.getForms().forEach(function(form) {
+            if (form[0].endsWith(url)) {
+                savedForm = form[1];
+            }
+        });
+        if (savedForm) {
+            savedForm.replace(/\+/g, '%20').split('&').forEach(function(kv) {
+                kv = kv.split('=', 2);
+                if (kv[0] != 'save_inspected' && kv[0] != 'public_update' && kv[0] != 'save') {
+                    $('[name=' + kv[0] + ']').val(decodeURIComponent(kv[1]));
+                }
+            });
+        }
+
+        $('#report_inspect_form').submit(function() {
+            var data = $(this).serialize() + '&save=1&saved_at=' + Math.floor(+new Date() / 1000);
+            fixmystreet.offlineData.addForm(this.action, data);
+            location.href = '/my/planned?saved=1';
+            return false;
+        });
+
         return true;
     }
 
@@ -250,7 +356,20 @@ if ($('#offline_list').length) {
         if (html) {
             $('#offline_list').before('<h2>Your offline reports</h2>');
             $('#offline_list').html(html);
+            if (location.search.indexOf('saved=1') > 0) {
+                $('#offline_list').before('<p class="form-success">Your form has been saved offline for submission when back online.</p>');
+            }
             fixmystreet.offline.replaceImages('#offline_list img');
+            var offlineForms = fixmystreet.offlineData.getForms();
+            var savedForms = {};
+            offlineForms.forEach(function(form) {
+                savedForms[form[0]] = 1;
+            });
+            $('#offline_list a').each(function(i, a) {
+                if (savedForms[a.href]) {
+                    $(this).find('h3').prepend('<em>Form data saved</em> ');
+                }
+            });
         }
     }
     fixmystreet.offlineBanner.make(true);
-- 
cgit v1.2.3


From adf07727ab14468c262759a21dedc1ac84cd32c8 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 8 Dec 2016 10:34:10 +0000
Subject: Add a clear offline data button.

---
 templates/web/base/offline/appcache.html |  2 ++
 web/cobrands/fixmystreet/offline.js      | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/templates/web/base/offline/appcache.html b/templates/web/base/offline/appcache.html
index 6f701321a..5a8ba1463 100644
--- a/templates/web/base/offline/appcache.html
+++ b/templates/web/base/offline/appcache.html
@@ -7,4 +7,6 @@ page wasn’t found or there was a server error. Please try again later.</p>
 
 <ul class="item-list item-list--reports" id="offline_list"></ul>
 
+<div id="offline_clear"></div>
+
 [% INCLUDE 'footer.html' %]
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index c875c9b84..c1a93f738 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -127,6 +127,11 @@ fixmystreet.offlineData = (function() {
             saveData();
             fixmystreet.offlineBanner.update();
         },
+        clearForms: function(idx) {
+            getData().forms = [];
+            saveData();
+            fixmystreet.offlineBanner.update();
+        },
         getCachedUrls: function() {
             return Object.keys(getData().cachedReports);
         },
@@ -370,6 +375,13 @@ if ($('#offline_list').length) {
                     $(this).find('h3').prepend('<em>Form data saved</em> ');
                 }
             });
+            $('#offline_clear').html('<button id="js-clear-localStorage">Clear offline data</button>');
+            $('#js-clear-localStorage').click(function() {
+                fixmystreet.offline.removeReports(fixmystreet.offlineData.getCachedUrls());
+                fixmystreet.offlineData.clearForms();
+                localStorage.removeItem('/my/planned');
+                alert('Offline data cleared');
+            });
         }
     }
     fixmystreet.offlineBanner.make(true);
-- 
cgit v1.2.3


From fd263bf98521d8576fae5c39d617eb5a2ae3d160 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 13:17:01 +0000
Subject: Try and not show offline banner unnecessarily.

---
 web/cobrands/fixmystreet/offline.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index c1a93f738..54ab12061 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -25,12 +25,11 @@ fixmystreet.offlineBanner = (function() {
             banner.push('</span></p></div>');
             banner = $(banner.join(''));
             banner.prependTo('.content');
-            if (!offline && num === 0) {
+            if (num === 0) {
                 banner.hide();
             }
 
             window.addEventListener("offline", function(e) {
-                $('.top_banner--offline').slideDown();
                 $('#offline_forms').html(offlineText());
             });
 
-- 
cgit v1.2.3


From db50779030f36673f8b63d1209e149d1ce34ba11 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 13:25:31 +0000
Subject: Fix use of .auto.min.js files.

fddf7f95 broke the use of minimized JS files, because it always used an
unchanged $url in the output. Make sure it is updated if $file is.
---
 perllib/FixMyStreet/App/View/Web.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index 22387f5f6..b73fa82ef 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -147,7 +147,7 @@ sub version {
         # See if there's an auto.min.js version and use that instead if there is
         (my $file_min = $file) =~ s/\.js$/.auto.min.js/;
         _version_get_mtime($file_min);
-        $file = $file_min if $version_hash{$file_min} >= $version_hash{$file};
+        $url = $file = $file_min if $version_hash{$file_min} >= $version_hash{$file};
     }
     my $admin = $self->template->context->stash->{admin} ? FixMyStreet->config('ADMIN_BASE_URL') : '';
     return "$admin$url?$version_hash{$file}";
-- 
cgit v1.2.3


From 03b715f6134e40fcce592e9c33b8a8f119dc814c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 15:07:14 +0000
Subject: [fixmystreet.com] Add donate banner.

---
 templates/web/fixmystreet.com/header.html | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 templates/web/fixmystreet.com/header.html

diff --git a/templates/web/fixmystreet.com/header.html b/templates/web/fixmystreet.com/header.html
new file mode 100644
index 000000000..48759d614
--- /dev/null
+++ b/templates/web/fixmystreet.com/header.html
@@ -0,0 +1,45 @@
+[% SET html_att = ' lang="' _ lang_code _ '"' -%]
+<!doctype html>
+<!--[if IE 7]>   <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
+<!--[if IE 8]>   <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
+<!--[if IE 9]>   <html class="no-js ie9"[% html_att %]><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]
+[% IF appcache ~%]
+ manifest="/offline/appcache.manifest"
+[%~ END %]><!--<![endif]-->
+    <head>
+        <meta name="viewport" content="initial-scale=1.0">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+        <meta name="HandHeldFriendly" content="true">
+        <meta name="mobileoptimized" content="0">
+
+        [% INCLUDE 'header_opengraph.html' %]
+        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/base.css') %]">
+        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/layout.css') %]" media="(min-width:48em)">
+        [% extra_css %]
+        <!--[if (lt IE 9) & (!IEMobile)]>
+            <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/layout.css') %]">
+        <![endif]-->
+
+        [% INCLUDE 'common_header_tags.html' %]
+
+        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
+            <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
+        [% END %]
+
+        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
+
+    </head>
+    [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
+    <body class="[% bodyclass | html IF bodyclass %]">
+        <div class="top_banner top_banner--donate"><p>FixMyStreet is run by the charity mySociety. <a href="https://www.mysociety.org/donate/?utm_source=fixmystreet.com&utm_medium=banner&utm_campaign=december_2016&utm_content=banner+donate+now">Can you help support us with a small donation?</a></p></div>
+
+    <div class="wrapper">
+        <div class="table-cell">
+            [% INCLUDE 'header_site.html' %]
+
+            [% pre_container_extra %]
+
+            <div class="container">
+                <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
-- 
cgit v1.2.3


From 44ab167797df1f8497ef67c2b9467def796f08d7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 16:13:30 +0000
Subject: [Angus,Bristol] Don't try and add assets if no map

---
 web/cobrands/angus/js.js   | 8 ++++++++
 web/cobrands/bristol/js.js | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/web/cobrands/angus/js.js b/web/cobrands/angus/js.js
index af70fd92f..f3e7bf211 100644
--- a/web/cobrands/angus/js.js
+++ b/web/cobrands/angus/js.js
@@ -1,3 +1,9 @@
+(function(){
+
+if (!fixmystreet.maps) {
+    return;
+}
+
 $(fixmystreet.add_assets({
     wfs_url: "https://data.angus.gov.uk/geoserver/services/wfs",
     wfs_feature: "lighting_column_v",
@@ -13,3 +19,5 @@ $(fixmystreet.add_assets({
     },
     geometryName: 'g'
 }));
+
+})();
diff --git a/web/cobrands/bristol/js.js b/web/cobrands/bristol/js.js
index 129037d23..1fc23d61a 100644
--- a/web/cobrands/bristol/js.js
+++ b/web/cobrands/bristol/js.js
@@ -1,5 +1,9 @@
 (function(){
 
+if (!fixmystreet.maps) {
+    return;
+}
+
 var options = {
     wfs_url: "https://maps.bristol.gov.uk/arcgis/services/ext/FixMyStreetSupportData/MapServer/WFSServer",
     wfs_feature: "COD_ASSETS_POINT",
-- 
cgit v1.2.3


From 187a5c2cf5fdb9ce85c5677f4389cf30b2dd5db0 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 16 Dec 2016 17:01:48 +0000
Subject: [fixmystreet.com] Hide footer in print view.

---
 web/cobrands/fixmystreet.com/base.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index 905f20f41..e04465edc 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -253,6 +253,11 @@ $grid-breakpoint-sm: $mysoc-footer-breakpoint-sm;
 @import "mysoc_footer";
 
 .mysoc-footer {
+
+  @media print {
+    display: none;
+  }
+
   li {
     list-style: none;
   }
-- 
cgit v1.2.3


From a39fc7f0c8154917085bff21d8b97a4b2dab19f1 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Tue, 4 Oct 2016 14:45:58 +0100
Subject: Improve print layout for report list pages.

The main map page elements are given `position:static` to ensure they
flow onto as many pages as required. The map image is floated to the
right, rather than wasting space at the top of the file.

We also, if the user has the inspect permission, include hidden
rrint-only metadata in the report lists.
---
 templates/web/base/admin/report_blocks.html |  2 +
 templates/web/base/report/_item.html        | 56 +++++++++++++++++++
 web/cobrands/oxfordshire/base.scss          | 11 ++++
 web/cobrands/sass/_base.scss                | 84 +++++++++++++++++++++++++++--
 web/cobrands/sass/_mixins.scss              |  7 +++
 5 files changed, 156 insertions(+), 4 deletions(-)

diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index 3561d865d..1dd4c9dd0 100644
--- a/templates/web/base/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
@@ -1,5 +1,7 @@
 [%
 
+SET report_blocks_included = 1;
+
 SET state_pretty = {
     'confirmed' = loc('Open')
     'investigating' = loc('Investigating')
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 0f42b00ce..939dc5da6 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -1,9 +1,16 @@
+[% IF NOT report_blocks_included ~%]
+[% PROCESS 'admin/report_blocks.html' ~%]
+[% END ~%]
+
 <li class="item-list__item item-list--reports__item [% item_extra_class %]" data-report-id="[% problem.id | html %]">
 <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">
     [% IF problem.photo %]
         <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
     [% END %]
         <h3 class="item-list__heading">[% problem.title | html %]</h3>
+    [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
+        <div class="item-list__description">[% problem.detail | html %]</div>
+    [% END %]
         <small>
             [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
                 [%- prettify_dt( problem.confirmed, 1 ) %]
@@ -27,5 +34,54 @@
                 [% loc('(closed)') %]
             [% END %]
         </small>
+
+    [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
+        <div class="item-list__item__metadata">
+            <div>
+                <h4>[% loc('Report ID:') %]</h4>
+                <p>[% problem.id %]</p>
+            </div>
+          [% IF problem.local_coords %]
+            <div>
+                <h4>[% loc('Easting/Northing:') %]</h4>
+                <p>[% problem.local_coords.0 %], [% problem.local_coords.1 %]</p>
+            </div>
+          [% END %]
+            <div>
+                <h4>[% loc('Latitude/Longitude:') %]</h4>
+                <p>[% problem.latitude %], [% problem.longitude %]</p>
+            </div>
+            <div>
+                <h4>[% loc('Category') %]</h4>
+                <p>[% (problem.category OR '-') | html %]</p>
+            </div>
+            <div>
+                <h4>[% loc('State') %]</h4>
+                <p>[% state_pretty.${problem.state} %]</p>
+            </div>
+            <div>
+                <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>
+            </div>
+          [% SET fields = problem.get_extra_fields; IF fields.size %]
+          [% FOR f IN fields %]
+            <div>
+                <h4>[% f.name %]</h4>
+                <p>[% f.value %]</p>
+            </div>
+          [% END %]
+          [% END %]
+        </div>
+    [% END %]
+
+
 </a>
 </li>
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 955c341bf..72ddbd437 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -87,3 +87,14 @@ dd, p {
         #fff
     );
 }
+
+@media print {
+    body {
+        background-color: #fff !important;
+    }
+
+    .mappage #oxford-header,
+    .mappage #side > .extra-text {
+        display: none !important;
+    }
+}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 7fb0c797f..93e3cf201 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -925,6 +925,14 @@ input.final-submit {
   margin: 0.25em 0 0;
   padding: 0.5em 1em;
   display: block;
+
+  @media print {
+    background-color: transparent !important;
+    margin: 0 !important;
+    padding: 1em 0 !important;
+    border-top: 1px solid #ccc;
+    page-break-inside: avoid;
+  }
 }
 
 .item-list__update-wrap {
@@ -954,28 +962,75 @@ input.final-submit {
 
 .item-list--reports__item {
   @extend %item-list__item--link;
+
   a {
     @include clearfix;
     padding: flip(0 0 0 1em, 0 1em 0 0);
+
+    @media print {
+      padding: 0;
+    }
   }
+
   .img {
     width: 90px;
     float: $right;
     height: auto;
     margin-#{$left}: 1em;
   }
+
   small {
     color: #666;
     display: block;
     padding: 0.25em 0;
   }
 }
+
+.item-list__item__metadata {
+  display: none;
+
+  @media print {
+    display: block;
+    @include flex-container();
+    @include flex-wrap(wrap);
+  }
+
+  & > * {
+    margin-top: 0.5em;
+    width: 33%;
+    @include flex(0 0 auto);
+  }
+
+  h4 {
+    margin: 0;
+    font-size: 0.75em;
+    font-weight: bold;
+  }
+
+  p {
+    margin-bottom: 0;
+    min-height: 1.4em;
+  }
+}
+
 .item-list__heading {
   font-size: 1em;
   font-weight: normal;
   line-height: 1.5;
   padding-top: 0.25em;
   margin: 0;
+
+  @media print {
+    font-weight: bold;
+  }
+}
+
+.item-list__description {
+  display: none;
+
+  @media print {
+    display: block;
+  }
 }
 
 .item-list__item--empty p {
@@ -1987,15 +2042,36 @@ table.nicetable {
   #sub_map_links,
   #fms_pan_zoom,
   .screen-only,
-  .olMapViewport {
+  .olMapViewport,
+  .big-green-banner,
+  .click-the-map,
+  #skip-this-step,
+  .my-account-buttons {
     display: none !important;
   }
 
-  #map_box {
+  #site-header {
+    display: block !important;
+    position: static !important;
+  }
+
+  #map_box,
+  #map_sidebar {
     position: static !important;
-    height: 256px !important;
     width: auto !important;
-    background: #f1eee9 !important; // cream colour to match OSM image
+    background: transparent !important;
+  }
+
+  #map_box {
+    float: right !important;
+    width: 256px !important;
+    height: 256px !important;
+    margin: 0 0 1em 1em !important;
+  }
+
+  #map_sidebar {
+      // Prevent sidebar from clearing below floated map
+      overflow: visible !important;
   }
 
   #map {
diff --git a/web/cobrands/sass/_mixins.scss b/web/cobrands/sass/_mixins.scss
index 6d4f523ce..2b05b3c21 100644
--- a/web/cobrands/sass/_mixins.scss
+++ b/web/cobrands/sass/_mixins.scss
@@ -158,6 +158,13 @@ $right: right;
   flex: $values;
 }
 
+@mixin flex-wrap($wrap) {
+  -webkit-box-wrap: $wrap;
+  -webkit-flex-wrap: $wrap;
+  -ms-flex-wrap: $wrap;
+  flex-wrap: $wrap;
+}
+
 @mixin flex-align($alignment) {
   -webkit-box-align: $alignment;
   -webkit-align-items: $alignment;
-- 
cgit v1.2.3


From e7ed4a1168a1661e75d86025c284a3517d2d9340 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 18:10:22 +0000
Subject: Only load user body permissions once per request.

This should help if a template uses has_permission_to a lot.
---
 perllib/FixMyStreet/DB/Result/User.pm | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index f4e5144f8..72acb6940 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -248,6 +248,15 @@ sub split_name {
     return { first => $first || '', last => $last || '' };
 }
 
+has body_permissions => (
+    is => 'ro',
+    lazy => 1,
+    default => sub {
+        my $self = shift;
+        return [ $self->user_body_permissions->all ];
+    },
+);
+
 sub permissions {
     my ($self, $c, $body_id) = @_;
 
@@ -258,9 +267,7 @@ sub permissions {
 
     return unless $self->belongs_to_body($body_id);
 
-    my @permissions = $self->user_body_permissions->search({
-        body_id => $self->from_body->id,
-    })->all;
+    my @permissions = grep { $_->body_id == $self->from_body->id } @{$self->body_permissions};
     return { map { $_->permission_type => 1 } @permissions };
 }
 
@@ -269,12 +276,13 @@ sub has_permission_to {
 
     return 1 if $self->is_superuser;
     return 0 if !$body_ids || (ref $body_ids && !@$body_ids);
+    $body_ids = [ $body_ids ] unless ref $body_ids;
+    my %body_ids = map { $_ => 1 } @$body_ids;
 
-    my $permission = $self->user_body_permissions->find({
-            permission_type => $permission_type,
-            body_id => $body_ids,
-        });
-    return $permission ? 1 : 0;
+    foreach (@{$self->body_permissions}) {
+        return 1 if $_->permission_type eq $permission_type && $body_ids{$_->body_id};
+    }
+    return 0;
 }
 
 =head2 has_body_permission_to
-- 
cgit v1.2.3


From cdaef42de3a3fe84b7764dc797a2f146dbe9d0be Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 3 Jan 2017 15:58:21 +0000
Subject: Revert "[fixmystreet.com] Add donate banner."

This reverts commit 03b715f6134e40fcce592e9c33b8a8f119dc814c.
---
 templates/web/fixmystreet.com/header.html | 45 -------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 templates/web/fixmystreet.com/header.html

diff --git a/templates/web/fixmystreet.com/header.html b/templates/web/fixmystreet.com/header.html
deleted file mode 100644
index 48759d614..000000000
--- a/templates/web/fixmystreet.com/header.html
+++ /dev/null
@@ -1,45 +0,0 @@
-[% SET html_att = ' lang="' _ lang_code _ '"' -%]
-<!doctype html>
-<!--[if IE 7]>   <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
-<!--[if IE 8]>   <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
-<!--[if IE 9]>   <html class="no-js ie9"[% html_att %]><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]
-[% IF appcache ~%]
- manifest="/offline/appcache.manifest"
-[%~ END %]><!--<![endif]-->
-    <head>
-        <meta name="viewport" content="initial-scale=1.0">
-
-        <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-        <meta name="HandHeldFriendly" content="true">
-        <meta name="mobileoptimized" content="0">
-
-        [% INCLUDE 'header_opengraph.html' %]
-        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/base.css') %]">
-        <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/layout.css') %]" media="(min-width:48em)">
-        [% extra_css %]
-        <!--[if (lt IE 9) & (!IEMobile)]>
-            <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/layout.css') %]">
-        <![endif]-->
-
-        [% INCLUDE 'common_header_tags.html' %]
-
-        [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
-            <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
-        [% END %]
-
-        [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
-
-    </head>
-    [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
-    <body class="[% bodyclass | html IF bodyclass %]">
-        <div class="top_banner top_banner--donate"><p>FixMyStreet is run by the charity mySociety. <a href="https://www.mysociety.org/donate/?utm_source=fixmystreet.com&utm_medium=banner&utm_campaign=december_2016&utm_content=banner+donate+now">Can you help support us with a small donation?</a></p></div>
-
-    <div class="wrapper">
-        <div class="table-cell">
-            [% INCLUDE 'header_site.html' %]
-
-            [% pre_container_extra %]
-
-            <div class="container">
-                <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
-- 
cgit v1.2.3


From 0a5a8430025555ffef822345a4dc1f4474ef37b7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Tue, 3 Jan 2017 17:14:11 +0000
Subject: Fix bad cross-year test.

Make sure the tested date is in the same year as current.
---
 t/utils.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/t/utils.t b/t/utils.t
index ac9eb1a4a..d6c56d95a 100644
--- a/t/utils.t
+++ b/t/utils.t
@@ -78,7 +78,11 @@ if ($dt->day_of_week == 7) { # Sunday
 }
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %A");
 
-$dt = DateTime->now->subtract(days => 100);
+if ($dt->month == 1) { # January
+    $dt = DateTime->now->add(days => 30);
+} else {
+    $dt = DateTime->now->subtract(days => 30);
+}
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %A %e %B %Y");
 is Utils::prettify_dt($dt, "date"), $dt->strftime("%A %e %B %Y");
 is Utils::prettify_dt($dt, "zurich"), $dt->strftime("%H:%M, %e. %B %Y");
-- 
cgit v1.2.3


From 7eb758ab64d6d179d28dd8ac0acb33c91593e82f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 4 Jan 2017 13:55:34 +0000
Subject: [fixmystreet.com] Update text on council page.

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

diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index 6814f70c3..5419f6c11 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -196,21 +196,21 @@
               <div class="accordion-item">
                 <a href="#" class="accordion-switch accordion-switch--closed"><h4>Asset locations</h4></a>
                 <div class="accordion-content">
-                  <p class="extra-pricing__price">&pound;3,500 per year or included as standard within our case management service</p>
+                  <p class="extra-pricing__price">&pound;3,500 per year or included as standard within our top‐to‐bottom case‐management service.</p>
                   <p class="extra-pricing__desc">Show your residents the locations, identifiers and status of assets right on the map — all they have to do is pick the right one. Compatible with any industry standard WFS or WMS service.</p>
                 </div>
               </div>
               <div class="accordion-item">
                 <a href="#" class="accordion-switch accordion-switch--closed"><h4>Adopted roads</h4></a>
                 <div class="accordion-content">
-                  <p class="extra-pricing__price">&pound;3,500 per year or included as standard within our case management service.</p>
+                  <p class="extra-pricing__price">&pound;3,500 per year or included as standard within our top‐to‐bottom case‐management service.</p>
                   <p class="extra-pricing__desc">Ensure that you only receive reports for roads that you actually manage. Highlight adopted roads and private estates at the point of report creation, saving valuable time, expense and irritation. Compatible with any industry standard WFS or WMS service.</p>
                 </div>
               </div>
               <div class="accordion-item">
                 <a href="#" class="accordion-switch accordion-switch--closed"><h4>Planned works</h4></a>
                 <div class="accordion-content">
-                  <p class="extra-pricing__price">&pound;3,000 per year or included as standard within our case management service.</p>
+                  <p class="extra-pricing__price">&pound;3,000 per year or included as standard within our top‐to‐bottom case‐management service.</p>
                   <p class="extra-pricing__desc">Publish your planned works alongside reports to keep residents informed and lower the incidence of unnecessary reporting. Support for Elgin’s roadworks.org or any industry standard WFS or WMS service.</p>
                 </div>
               </div>
-- 
cgit v1.2.3


From d7c3106d64f8237a4f6388a0e51dcd29bae93ec8 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 1 Dec 2016 16:51:04 +0000
Subject: =?UTF-8?q?Add=20=E2=80=98state=E2=80=99=20field=20to=20ResponseTe?=
 =?UTF-8?q?mplate=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.sql                                     | 1 +
 db/schema_0048-response-templates-add-state.sql   | 6 ++++++
 perllib/FixMyStreet/DB/Result/ResponseTemplate.pm | 6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 db/schema_0048-response-templates-add-state.sql

diff --git a/db/schema.sql b/db/schema.sql
index d3bb5040e..e54c6b7b2 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -486,6 +486,7 @@ create table response_templates (
     text text not null,
     created timestamp not null default current_timestamp,
     auto_response boolean NOT NULL DEFAULT 'f',
+    state text,
     unique(body_id, title)
 );
 
diff --git a/db/schema_0048-response-templates-add-state.sql b/db/schema_0048-response-templates-add-state.sql
new file mode 100644
index 000000000..1bc95ee6d
--- /dev/null
+++ b/db/schema_0048-response-templates-add-state.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE response_templates
+    ADD COLUMN state TEXT;
+
+COMMIT;
diff --git a/perllib/FixMyStreet/DB/Result/ResponseTemplate.pm b/perllib/FixMyStreet/DB/Result/ResponseTemplate.pm
index 0d4377dba..5a2029eb1 100644
--- a/perllib/FixMyStreet/DB/Result/ResponseTemplate.pm
+++ b/perllib/FixMyStreet/DB/Result/ResponseTemplate.pm
@@ -33,6 +33,8 @@ __PACKAGE__->add_columns(
   },
   "auto_response",
   { data_type => "boolean", default_value => \"false", is_nullable => 0 },
+  "state",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint("response_templates_body_id_title_key", ["body_id", "title"]);
@@ -50,8 +52,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-08-24 11:29:04
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KRm0RHbtrzuxzH0S/UAsdw
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-12-01 15:10:52
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ySPzQpFwJNki8XBjCNiqZQ
 
 __PACKAGE__->many_to_many( contacts => 'contact_response_templates', 'contact' );
 
-- 
cgit v1.2.3


From 7416881f07d2a02ce0c98718e0ca5790a39518d7 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 1 Dec 2016 16:52:34 +0000
Subject: Allow editing of ResponseTemplate state in admin

This includes a refactor of the state dropdown field into its own template for easy reuse.
---
 perllib/FixMyStreet/App/Controller/Admin.pm       |  1 +
 templates/web/base/admin/report_edit.html         | 14 ++++----------
 templates/web/base/admin/state_groups_select.html | 14 ++++++++++++++
 templates/web/base/admin/template_edit.html       | 10 ++++++++++
 templates/web/base/report/_inspect.html           | 12 +-----------
 5 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 templates/web/base/admin/state_groups_select.html

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index bbdf449aa..592d37d4e 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -978,6 +978,7 @@ sub template_edit : Path('templates') : Args(2) {
         } else {
             $template->title( $c->get_param('title') );
             $template->text( $c->get_param('text') );
+            $template->state( $c->get_param('state') );
             $template->auto_response( $c->get_param('auto_response') ? 1 : 0 );
             $template->update_or_insert;
 
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 02e75563c..911b1995a 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -112,16 +112,10 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
 <li><label for='detail'>[% loc('Details:') %]</label>
 <textarea class="form-control" name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li>
 
-<li><label class="inline-text" for="state">[% loc('State:') %]</label>
-<select class="form-control" name="state"  id="state">
-[% FOREACH group IN state_groups %]
-    <optgroup label="[% group.0 %]">
-    [% FOREACH state IN group.1 %]
-        <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option>
-    [% END %]
-    </optgroup>
-[% END %]
-</select></li>
+<li>
+    <label class="inline-text" for="state">[% loc('State:') %]</label>
+    [% INCLUDE 'admin/state_groups_select.html' %]
+</li>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
 <select class="form-control" name="category" id="category">
   [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
diff --git a/templates/web/base/admin/state_groups_select.html b/templates/web/base/admin/state_groups_select.html
new file mode 100644
index 000000000..229d181ab
--- /dev/null
+++ b/templates/web/base/admin/state_groups_select.html
@@ -0,0 +1,14 @@
+[% PROCESS 'admin/report_blocks.html'; # For state_groups %]
+[% DEFAULT current_state = problem.state %]
+<select class="form-control" name="state"  id="state">
+[% IF include_empty %]
+    <option value="">---</option>
+[% END %]
+[% FOREACH group IN state_groups %]
+    <optgroup label="[% group.0 %]">
+    [% FOREACH state IN group.1 %]
+        <option [% 'selected ' IF state == current_state %] value="[% state %]">[% state_pretty.$state %]</option>
+    [% END %]
+    </optgroup>
+[% END %]
+</select>
diff --git a/templates/web/base/admin/template_edit.html b/templates/web/base/admin/template_edit.html
index b2e734756..76de70dcc 100644
--- a/templates/web/base/admin/template_edit.html
+++ b/templates/web/base/admin/template_edit.html
@@ -31,6 +31,16 @@
     </div>
     [% INCLUDE 'admin/category-checkboxes.html' %]
 
+    <div class="admin-hint">
+      <p>
+        [% loc('If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here.') %]
+      </p>
+    </div>
+    <p>
+      <label for="state">[% loc('State') %]</label>
+      [% INCLUDE 'admin/state_groups_select.html' current_state=rt.state include_empty=1 %]
+    </p>
+
     <p>
       <input type="hidden" name="token" value="[% csrf_token %]" >
       <input type="submit" class="btn" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 84170a38c..43e86cb47 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -1,4 +1,3 @@
-[% PROCESS 'admin/report_blocks.html'; # For the report state dropdown %]
 [% permissions = c.user.permissions(c, problem.bodies_str) %]
 [% second_column = BLOCK -%]
   <div id="side-inspect">
@@ -65,16 +64,7 @@
         [% IF permissions.report_inspect %]
           <p>
             <label for="state">[% loc('State') %]</label>
-              [%# XXX this is duplicated from admin/report_edit.html, should be refactored %]
-            <select name="state" id="state" class="form-control">
-              [% FOREACH group IN state_groups %]
-                <optgroup label="[% group.0 %]">
-                  [% FOREACH state IN group.1 %]
-                    <option [% 'selected ' IF state == problem.state %] value="[% state %]">[% state_pretty.$state %]</option>
-                  [% END %]
-                </optgroup>
-              [% END %]
-            </select>
+            [% INCLUDE 'admin/state_groups_select.html' %]
           </p>
           <div id="js-duplicate-reports" class="[% "hidden" UNLESS problem.duplicate_of %]">
             <input type="hidden" name="duplicate_of" value="[% problem.duplicate_of.id %]">
-- 
cgit v1.2.3


From aa26b2bb569c657db3452eeac21df8cd415d77e7 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 1 Dec 2016 16:54:20 +0000
Subject: Prefill update field based on problem state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If there’s a response template matching the problem’s new state,
it’s selected and the update field prefilled accordingly.
The exception to this is if the user has manually entered text
into the update field already.
---
 .../web/base/admin/response_templates_select.html  |  2 +-
 web/cobrands/fixmystreet/fixmystreet.js            | 23 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/templates/web/base/admin/response_templates_select.html b/templates/web/base/admin/response_templates_select.html
index 417be9add..e10460e48 100644
--- a/templates/web/base/admin/response_templates_select.html
+++ b/templates/web/base/admin/response_templates_select.html
@@ -3,7 +3,7 @@
     <select id="templates_for_[% for %]" class="form-control js-template-name" data-for="[% for %]" name="response_template">
         <option value="">[% loc('--Choose a template--') %]</option>
       [% FOR t IN problem.response_templates %]
-        <option value="[% t.text | html %]"> [% t.title | html %] </option>
+        <option value="[% t.text | html %]" data-problem-state="[% t.state | html %]"> [% t.title | html %] </option>
       [% END %]
     </select>
 </div>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index dd9167185..35a655c86 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -675,13 +675,21 @@ $.extend(fixmystreet.set_up, {
     // The inspect form submit button can change depending on the selected state
     $("#report_inspect_form [name=state]").change(function(){
         var state = $(this).val();
-        var $submit = $("#report_inspect_form input[type=submit]");
+        var $inspect_form = $("#report_inspect_form");
+        var $submit = $inspect_form.find("input[type=submit]");
         var value = $submit.attr('data-value-'+state);
         if (value !== undefined) {
             $submit.val(value);
         } else {
             $submit.val($submit.data('valueOriginal'));
         }
+
+        // We might also have a response template to preselect for the new state
+        var $select = $inspect_form.find("select.js-template-name");
+        var $option = $select.find("option[data-problem-state='"+state+"']").first();
+        if ($option.length) {
+            $select.val($option.val()).change();
+        }
     }).change();
 
     $('.js-toggle-public-update').each(function() {
@@ -1001,9 +1009,20 @@ $.extend(fixmystreet.set_up, {
   },
 
   response_templates: function() {
+      // If the user has manually edited the contents of an update field,
+      // mark it as dirty so it doesn't get clobbered if we select another
+      // response template. If the field is empty, it's not considered dirty.
+      $('.js-template-name').each(function() {
+          var $input = $('#' + $(this).data('for'));
+          $input.change(function() { $(this).data('dirty', !/^\s*$/.test($(this).val())); });
+      });
+
       $('.js-template-name').change(function() {
           var $this = $(this);
-          $('#' + $this.data('for')).val($this.val());
+          var $input = $('#' + $this.data('for'));
+          if (!$input.data('dirty')) {
+              $input.val($this.val());
+          }
       });
   }
 });
-- 
cgit v1.2.3


From 265c62d1fd13e704b8f101b19c66183d46c808b0 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Tue, 10 Jan 2017 10:24:52 +0000
Subject: [UK Councils] Disable show name checkbox when reporting as someone
 else

---
 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 dd9167185..87f3fd81c 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -492,7 +492,7 @@ $.extend(fixmystreet.set_up, {
         } else if (val === 'another_user') {
             $emailInput.val('').prop('disabled', false);
             $nameInput.val('').prop('disabled', false);
-            $showNameCheckbox.prop('checked', false).prop('disabled', false);
+            $showNameCheckbox.prop('checked', false).prop('disabled', true);
             $addAlertCheckbox.prop('checked', true).prop('disabled', false);
         } else if (val === 'body') {
             $emailInput.val('-').prop('disabled', true);
-- 
cgit v1.2.3


From a7c7bdd37db612dc857d28901f9970e49706bea0 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Tue, 10 Jan 2017 11:03:52 +0000
Subject: [UK Councils] Reword photo advice

---
 templates/web/fixmystreet-uk-councils/report/new/after_photo.html | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 templates/web/fixmystreet-uk-councils/report/new/after_photo.html

diff --git a/templates/web/fixmystreet-uk-councils/report/new/after_photo.html b/templates/web/fixmystreet-uk-councils/report/new/after_photo.html
new file mode 100644
index 000000000..65a5768bb
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/report/new/after_photo.html
@@ -0,0 +1,8 @@
+<div class="description_tips" aria-label="[% loc('Tips for perfect photos') %]">
+    <ul class="do">
+        <li>[% loc('To help us locate the problem, include both a close-up and a wide shot') %]</li>
+    </ul>
+    <ul class="dont">
+        <li>[% loc('Avoid personal information and vehicle number plates') %]</li>
+    </ul>
+</div>
-- 
cgit v1.2.3


From d5641749504a8eb9295f95bac412cb3737256476 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Jan 2017 13:24:44 +0000
Subject: Update has_body_permission_to to allow superusers.

---
 perllib/FixMyStreet/App/Controller/Admin.pm               |  7 +++----
 .../App/Controller/Admin/ResponsePriorities.pm            |  5 ++---
 perllib/FixMyStreet/Cobrand/Default.pm                    | 10 +++++-----
 perllib/FixMyStreet/DB/Result/User.pm                     | 15 +++++++++------
 templates/web/base/admin/user-form.html                   |  4 ++--
 templates/web/base/admin/users.html                       |  2 +-
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 592d37d4e..d8c5cdf6d 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1006,10 +1006,9 @@ sub load_template_body : Private {
     my ($self, $c, $body_id) = @_;
 
     my $zurich_user = $c->user->from_body && $c->cobrand->moniker eq 'zurich';
-    my $has_permission = $c->user->has_body_permission_to('template_edit') &&
-                         $c->user->from_body->id eq $body_id;
+    my $has_permission = $c->user->has_body_permission_to('template_edit', $body_id);
 
-    unless ( $c->user->is_superuser || $zurich_user || $has_permission ) {
+    unless ( $zurich_user || $has_permission ) {
         $c->detach( '/page_error_404_not_found', [] );
     }
 
@@ -1235,7 +1234,7 @@ sub user_edit : Path('user_edit') : Args(1) {
     my $user = $c->cobrand->users->find( { id => $id } );
     $c->detach( '/page_error_404_not_found', [] ) unless $user;
 
-    unless ( $c->user->is_superuser || $c->user->has_body_permission_to('user_edit') || $c->cobrand->moniker eq 'zurich' ) {
+    unless ( $c->user->has_body_permission_to('user_edit') || $c->cobrand->moniker eq 'zurich' ) {
         $c->detach('/page_error_403_access_denied', []);
     }
 
diff --git a/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm b/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
index 032e593c6..a6c13c117 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
@@ -92,10 +92,9 @@ sub edit : Path : Args(2) {
 sub load_user_body : Private {
     my ($self, $c, $body_id) = @_;
 
-    my $has_permission = $c->user->has_body_permission_to('responsepriority_edit') &&
-                         $c->user->from_body->id eq $body_id;
+    my $has_permission = $c->user->has_body_permission_to('responsepriority_edit', $body_id);
 
-    unless ( $c->user->is_superuser || $has_permission ) {
+    unless ( $has_permission ) {
         $c->detach( '/page_error_404_not_found' );
     }
 
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 27111deb2..61982c47a 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -646,27 +646,27 @@ sub admin_pages {
         $pages->{config} = [ _('Configuration'), 9];
     };
     # And some that need special permissions
-    if ( $user->is_superuser || $user->has_body_permission_to('category_edit') ) {
+    if ( $user->has_body_permission_to('category_edit') ) {
         my $page_title = $user->is_superuser ? _('Bodies') : _('Categories');
         $pages->{bodies} = [ $page_title, 1 ];
         $pages->{body} = [ undef, undef ];
     }
-    if ( $user->is_superuser || $user->has_body_permission_to('report_edit') ) {
+    if ( $user->has_body_permission_to('report_edit') ) {
         $pages->{reports} = [ _('Reports'), 2 ];
         $pages->{report_edit} = [ undef, undef ];
         $pages->{update_edit} = [ undef, undef ];
         $pages->{abuse_edit} = [ undef, undef ];
     }
-    if ( $user->is_superuser || $user->has_body_permission_to('template_edit') ) {
+    if ( $user->has_body_permission_to('template_edit') ) {
         $pages->{templates} = [ _('Templates'), 3 ];
         $pages->{template_edit} = [ undef, undef ];
     };
-    if ( $user->is_superuser || $user->has_body_permission_to('responsepriority_edit') ) {
+    if ( $user->has_body_permission_to('responsepriority_edit') ) {
         $pages->{responsepriorities} = [ _('Priorities'), 4 ];
         $pages->{responsepriority_edit} = [ undef, undef ];
     };
 
-    if ( $user->is_superuser || $user->has_body_permission_to('user_edit') ) {
+    if ( $user->has_body_permission_to('user_edit') ) {
         $pages->{users} = [ _('Users'), 6 ];
         $pages->{user_edit} = [ undef, undef ];
     }
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index 72acb6940..135f9b4a5 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -287,23 +287,26 @@ sub has_permission_to {
 
 =head2 has_body_permission_to
 
-Checks if the User has a from_body set, and the specified permission on that body.
+Checks if the User has a from_body set, the specified permission on that body,
+and optionally that their from_body is one particular body.
 
 Instead of saying:
 
-    ($user->from_body && $user->has_permission_to('user_edit', $user->from_body->id))
+    ($user->from_body && $user->from_body->id == $body_id && $user->has_permission_to('user_edit', $body_id))
 
 You can just say:
 
-    $user->has_body_permission_to('user_edit')
-
-NB unlike has_permission_to, this doesn't blindly return 1 if the user is a superuser.
+    $user->has_body_permission_to('user_edit', $body_id)
 
 =cut
 
 sub has_body_permission_to {
-    my ($self, $permission_type) = @_;
+    my ($self, $permission_type, $body_id) = @_;
+
+    return 1 if $self->is_superuser;
+
     return unless $self->from_body;
+    return if $body_id && $self->from_body->id != $body_id;
 
     return $self->has_permission_to($permission_type, $self->from_body->id);
 }
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 17230e940..0f5452b0a 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -47,7 +47,7 @@
                 [% loc("Staff users have permission to log in to the admin.") %]
               </p>
             </div>
-            [% loc('Staff:') %] <input type="checkbox" id="body" name="body" value="[% c.user.from_body.id %]" [% user.from_body.id == c.user.from_body.id ? ' checked' : '' %] [% 'disabled' UNLESS c.user.is_superuser OR c.user.has_body_permission_to('user_assign_body') %]>
+            [% loc('Staff:') %] <input type="checkbox" id="body" name="body" value="[% c.user.from_body.id %]" [% user.from_body.id == c.user.from_body.id ? ' checked' : '' %] [% 'disabled' UNLESS c.user.has_body_permission_to('user_assign_body') %]>
           </li>
         [% END %]
 
@@ -162,7 +162,7 @@
                 [% FOREACH permission IN group.value %]
                   <li>
                     <label class="inline">
-                      <input type="checkbox" id="perms_[% permission.key %]" name="permissions[[% permission.key %]]" [% "checked" IF user.has_body_permission_to(permission.key) %]>
+                      <input type="checkbox" id="perms_[% permission.key %]" name="permissions[[% permission.key %]]" [% "checked" IF NOT user.is_superuser AND user.has_body_permission_to(permission.key) %]>
                       [% permission.value %]
                     </label>
                   </li>
diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html
index 757046bcf..7bbe04e1e 100644
--- a/templates/web/base/admin/users.html
+++ b/templates/web/base/admin/users.html
@@ -26,7 +26,7 @@
         <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
         <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
         <td>[% PROCESS value_or_nbsp value=user.from_body.name %]
-            [% IF user.has_body_permission_to('moderate') %] * [% END %]
+            [% IF NOT user.is_superuser AND user.has_body_permission_to('moderate') %] * [% END %]
         </td>
       [% IF c.cobrand.moniker != 'zurich' %]
         <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : '&nbsp;' %]</td>
-- 
cgit v1.2.3


From e973904765e4efb242d09d3d41d7f9eb0a294424 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Jan 2017 14:58:59 +0000
Subject: Move staging flags to their own config variable.

---
 conf/general.yml-example                   | 18 ++++++++++--------
 perllib/FixMyStreet.pm                     | 14 ++++++++++++++
 perllib/FixMyStreet/Cobrand/FiksGataMi.pm  |  2 +-
 perllib/FixMyStreet/Cobrand/FixaMinGata.pm |  2 +-
 perllib/FixMyStreet/Cobrand/UKCouncils.pm  |  6 +++---
 perllib/FixMyStreet/Script/Reports.pm      |  2 +-
 perllib/FixMyStreet/SendReport/Email.pm    |  2 +-
 t/cobrand/bromley.t                        |  2 +-
 t/cobrand/zurich.t                         |  4 ++--
 t/sendreport/open311.t                     |  2 +-
 templates/web/base/admin/bodies.html       |  4 ++--
 templates/web/base/admin/body.html         |  4 ++--
 templates/web/base/admin/config_page.html  |  6 +++++-
 13 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/conf/general.yml-example b/conf/general.yml-example
index 3b2c597b9..71fbeea35 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -41,14 +41,16 @@ DO_NOT_REPLY_EMAIL: 'do-not-reply@example.org'
 # Whether this is a development site or not. It will mean e.g. templates/
 # CSS modified times aren't cached
 STAGING_SITE: 1
-# Normally, a staging site will route all reports to the reporter on a
-# development site (when STAGING_SITE is 1), to guard against sending fake
-# reports to live places. Set this to 1 if you want a dev site to route
-# reports as normal.
-SEND_REPORTS_ON_STAGING: 0
-# Manual testing of multiple cobrands can be made easier by skipping some
-# checks they have in them, if this variable is set
-SKIP_CHECKS_ON_STAGING: 0
+# Developers may want a staging site to act differently from a live site.
+# Possible flags include:
+# - send_reports: Normally, a staging site will route all reports to the
+#   reporter, to guard against sending fake reports to live places. Set
+#   this to 1 if you want a staging site to route reports as normal.
+# - skip_checks: Manual testing of multiple cobrands can be made easier by
+#   skipping some checks they have in them, if this variable is set.
+STAGING_FLAGS:
+  send_reports: 0
+  skip_checks: 0
 
 # What to use as front page/alert example places placeholder
 # Defaults to High Street, Main Street
diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm
index 14f3f3607..1f4579293 100644
--- a/perllib/FixMyStreet.pm
+++ b/perllib/FixMyStreet.pm
@@ -212,4 +212,18 @@ sub set_time_zone {
     $dt->set_time_zone($tz_f) if $tz_f;
 }
 
+# Development functions
+
+sub staging_flag {
+    my ($cls, $flag, $value) = @_;
+    $value = 1 unless defined $value;
+    return unless $cls->config('STAGING_SITE');
+    my $flags = $cls->config('STAGING_FLAGS');
+    unless ($flags && ref $flags eq 'HASH') {
+        # Assume all flags 0 if missing
+        return !$value;
+    }
+    return $flags->{$flag} == $value;
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
index 242735073..cf0d72f8e 100644
--- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
+++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm
@@ -30,7 +30,7 @@ sub disambiguate_location {
 
 sub area_types {
     my $self = shift;
-    return $self->next::method() if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $self->next::method() if FixMyStreet->staging_flag('skip_checks');
     [ 'NKO', 'NFY', 'NRA' ];
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
index 5b78b3fa1..324811008 100644
--- a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
+++ b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm
@@ -31,7 +31,7 @@ sub disambiguate_location {
 
 sub area_types {
     my $self = shift;
-    return $self->next::method() if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $self->next::method() if FixMyStreet->staging_flag('skip_checks');
     [ 'KOM' ];
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index c22224307..64ca7fc62 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -42,13 +42,13 @@ sub restriction {
 
 sub problems_restriction {
     my ($self, $rs) = @_;
-    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $rs if FixMyStreet->staging_flag('skip_checks');
     return $rs->to_body($self->council_id);
 }
 
 sub updates_restriction {
     my ($self, $rs) = @_;
-    return $rs if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return $rs if FixMyStreet->staging_flag('skip_checks');
     return $rs->to_body($self->council_id);
 }
 
@@ -105,7 +105,7 @@ sub enter_postcode_text {
 sub area_check {
     my ( $self, $params, $context ) = @_;
 
-    return 1 if FixMyStreet->config('STAGING_SITE') && FixMyStreet->config('SKIP_CHECKS_ON_STAGING');
+    return 1 if FixMyStreet->staging_flag('skip_checks');
 
     my $councils = $params->{all_areas};
     my $council_match = defined $councils->{$self->council_id};
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 7d614bc30..193c5fa41 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -211,7 +211,7 @@ sub send(;$) {
               . " ]\n\n";
         }
 
-        if (FixMyStreet->config('STAGING_SITE') && !FixMyStreet->config('SEND_REPORTS_ON_STAGING')) {
+        if (FixMyStreet->staging_flag('send_reports', 0)) {
             # on a staging server send emails to ourselves rather than the bodies
             %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::Email/ } keys %reporters;
             unless (%reporters) {
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 2eab1c754..4cee58d42 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -67,7 +67,7 @@ sub send {
     my $recips = $self->build_recipient_list( $row, $h );
 
     # on a staging server send emails to ourselves rather than the bodies
-    if (FixMyStreet->config('STAGING_SITE') && !FixMyStreet->config('SEND_REPORTS_ON_STAGING') && !FixMyStreet->test_mode) {
+    if (FixMyStreet->staging_flag('send_reports', 0) && !FixMyStreet->test_mode) {
         $recips = 1;
         @{$self->to} = [ $row->user->email, $self->to->[0][1] || $row->name ];
     }
diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t
index 43d936684..a7cc563dc 100644
--- a/t/cobrand/bromley.t
+++ b/t/cobrand/bromley.t
@@ -55,7 +55,7 @@ subtest 'testing special Open311 behaviour', sub {
     $body->update( { send_method => 'Open311', endpoint => 'http://bromley.endpoint.example.com', jurisdiction => 'FMS', api_key => 'test' } );
     my $test_data;
     FixMyStreet::override_config {
-        SEND_REPORTS_ON_STAGING => 1,
+        STAGING_FLAGS => { send_reports => 1 },
         ALLOWED_COBRANDS => [ 'fixmystreet', 'bromley' ],
     }, sub {
         $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index ddaae1f90..85cada27a 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -28,12 +28,12 @@ ok $sample_file->exists, "sample file $sample_file exists";
 my $sample_photo = $sample_file->slurp_raw;
 
 # This is a helper method that will send the reports but with the config
-# correctly set - notably SEND_REPORTS_ON_STAGING needs to be true, and
+# correctly set - notably STAGING_FLAGS send_reports needs to be true, and
 # zurich must be allowed cobrand if we want to be able to call cobrand
 # methods on it.
 sub send_reports_for_zurich {
     FixMyStreet::override_config {
-        SEND_REPORTS_ON_STAGING => 1,
+        STAGING_FLAGS => { send_reports => 1 },
         ALLOWED_COBRANDS => ['zurich']
     }, sub {
         # Actually send the report
diff --git a/t/sendreport/open311.t b/t/sendreport/open311.t
index 636faba31..c40b64d12 100644
--- a/t/sendreport/open311.t
+++ b/t/sendreport/open311.t
@@ -26,7 +26,7 @@ subtest 'testing Open311 behaviour', sub {
     $body->update( { send_method => 'Open311', endpoint => 'http://endpoint.example.com', jurisdiction => 'FMS', api_key => 'test' } );
     my $test_data;
     FixMyStreet::override_config {
-        SEND_REPORTS_ON_STAGING => 1,
+        STAGING_FLAGS => { send_reports => 1 },
         ALLOWED_COBRANDS => [ 'fixmystreet' ],
     }, sub {
         $test_data = FixMyStreet::DB->resultset('Problem')->send_reports();
diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html
index e98e2d350..9bd85940b 100644
--- a/templates/web/base/admin/bodies.html
+++ b/templates/web/base/admin/bodies.html
@@ -14,9 +14,9 @@
   </p>
 [% ELSE %]
 
-  [% IF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %]
+  [% IF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %]
   <p class="fms-admin-warning">
-    [% tprintf(loc("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."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %]
+    [% tprintf(loc("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."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %]
   </p>
   [% END %]
 
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index 5c9f4f9b9..5e8c6a164 100644
--- a/templates/web/base/admin/body.html
+++ b/templates/web/base/admin/body.html
@@ -59,9 +59,9 @@
     <br>
     [% loc("Add a contact using the form below.") %]
   </p>
-[% ELSIF c.config.STAGING_SITE and !c.config.SEND_REPORTS_ON_STAGING %]
+[% ELSIF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %]
   <p class="fms-admin-warning">
-    [% tprintf(loc("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."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>SEND_REPORTS_ON_STAGING</code></a>") %]
+    [% tprintf(loc("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."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %]
   </p>
 [% END %]
 
diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html
index 67661c597..f35cd6adb 100644
--- a/templates/web/base/admin/config_page.html
+++ b/templates/web/base/admin/config_page.html
@@ -118,7 +118,11 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
 
 [% INCLUDE subsection heading="Development" %]
 [% INCLUDE just_value value="STAGING_SITE" %]
-[% INCLUDE just_value value="SEND_REPORTS_ON_STAGING" %]
+[% staging_conf = FOR k IN c.config.STAGING_FLAGS %]
+    [% k.key %]:[% k.value %]
+    [%- ',' IF NOT loop.last %]
+[% END %]
+[% INCLUDE just_value value="STAGING_FLAGS" conf = staging_conf %]
 [% INCLUDE just_value value="UPLOAD_DIR" %]
 [% INCLUDE just_value value="GEO_CACHE" %]
 [% INCLUDE just_value value="TESTING_COUNCILS" %]
-- 
cgit v1.2.3


From 3fd19343c5e13e5a26740e181de03e702c642eee Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Jan 2017 15:16:04 +0000
Subject: Allow staging sites to turn off appcache.

---
 conf/general.yml-example                      | 2 ++
 perllib/FixMyStreet/App/Controller/Offline.pm | 9 +++++++++
 templates/web/base/offline/manifest.html      | 1 -
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/conf/general.yml-example b/conf/general.yml-example
index 71fbeea35..6c694024d 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -48,9 +48,11 @@ STAGING_SITE: 1
 #   this to 1 if you want a staging site to route reports as normal.
 # - skip_checks: Manual testing of multiple cobrands can be made easier by
 #   skipping some checks they have in them, if this variable is set.
+# - enable_appcache: Whether the appcache should be active.
 STAGING_FLAGS:
   send_reports: 0
   skip_checks: 0
+  enable_appcache: 0
 
 # What to use as front page/alert example places placeholder
 # Defaults to High Street, Main Street
diff --git a/perllib/FixMyStreet/App/Controller/Offline.pm b/perllib/FixMyStreet/App/Controller/Offline.pm
index 9acb33f7e..5f3b69f2e 100644
--- a/perllib/FixMyStreet/App/Controller/Offline.pm
+++ b/perllib/FixMyStreet/App/Controller/Offline.pm
@@ -11,6 +11,7 @@ FixMyStreet::App::Controller::Offline - Catalyst Controller
 =head1 DESCRIPTION
 
 Offline pages Catalyst Controller.
+On staging site, appcache only for people who want it.
 
 =head1 METHODS
 
@@ -18,6 +19,10 @@ Offline pages Catalyst Controller.
 
 sub manifest : Path("/offline/appcache.manifest") {
     my ($self, $c) = @_;
+    if (FixMyStreet->staging_flag('enable_appcache', 0)) {
+        $c->response->status(404);
+        $c->response->body('NOT FOUND');
+    }
     $c->res->content_type('text/cache-manifest; charset=utf-8');
     $c->res->header(Cache_Control => 'no-cache, no-store');
 }
@@ -25,6 +30,10 @@ sub manifest : Path("/offline/appcache.manifest") {
 sub appcache : Path("/offline/appcache") {
     my ($self, $c) = @_;
     $c->detach('/page_error_404_not_found', []) if keys %{$c->req->params};
+    if (FixMyStreet->staging_flag('enable_appcache', 0)) {
+        $c->response->status(404);
+        $c->response->body('NOT FOUND');
+    }
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/templates/web/base/offline/manifest.html b/templates/web/base/offline/manifest.html
index f5a9fddcc..93d26cb94 100644
--- a/templates/web/base/offline/manifest.html
+++ b/templates/web/base/offline/manifest.html
@@ -5,7 +5,6 @@ CACHE MANIFEST
 CACHE:
 [% version('/cobrands/' _ c.cobrand.asset_moniker _ '/base.css') %]
 [% version('/cobrands/' _ c.cobrand.asset_moniker _ '/layout.css') %]
-
 [% FOR script IN scripts ~%]
     [%- script %]
 [% END %]
-- 
cgit v1.2.3


From 940bd236650b2bf7208d9b06c33ee30ad94492f6 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 10 Jan 2017 16:07:15 +0000
Subject: =?UTF-8?q?Use=20=E2=80=98*=E2=80=99=20on=20admin=20page=20to=20si?=
 =?UTF-8?q?gnify=20superuser.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we now have many permissions, highlighting those who have the
moderate permission is not very useful.
---
 templates/web/base/admin/users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html
index 7bbe04e1e..47901aed8 100644
--- a/templates/web/base/admin/users.html
+++ b/templates/web/base/admin/users.html
@@ -26,7 +26,7 @@
         <td>[% PROCESS value_or_nbsp value=user.name %]</td> 
         <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> 
         <td>[% PROCESS value_or_nbsp value=user.from_body.name %]
-            [% IF NOT user.is_superuser AND user.has_body_permission_to('moderate') %] * [% END %]
+            [% IF user.is_superuser %] * [% END %]
         </td>
       [% IF c.cobrand.moniker != 'zurich' %]
         <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : '&nbsp;' %]</td>
-- 
cgit v1.2.3


From e2dc6536689b43f807302748aa6d65122a1e26f7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Jan 2017 14:37:40 +0000
Subject: Change offline wording to use 'update', not 'form'

---
 web/cobrands/fixmystreet/offline.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 54ab12061..177e54e4d 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -4,7 +4,7 @@ fixmystreet.offlineBanner = (function() {
 
     function formText() {
         var num = fixmystreet.offlineData.getForms().length;
-        return num + ' form' + (num===1 ? '' : 's');
+        return num + ' update' + (num===1 ? '' : 's');
     }
 
     function onlineText() {
@@ -361,7 +361,7 @@ if ($('#offline_list').length) {
             $('#offline_list').before('<h2>Your offline reports</h2>');
             $('#offline_list').html(html);
             if (location.search.indexOf('saved=1') > 0) {
-                $('#offline_list').before('<p class="form-success">Your form has been saved offline for submission when back online.</p>');
+                $('#offline_list').before('<p class="form-success">Your update has been saved offline for submission when back online.</p>');
             }
             fixmystreet.offline.replaceImages('#offline_list img');
             var offlineForms = fixmystreet.offlineData.getForms();
@@ -371,7 +371,7 @@ if ($('#offline_list').length) {
             });
             $('#offline_list a').each(function(i, a) {
                 if (savedForms[a.href]) {
-                    $(this).find('h3').prepend('<em>Form data saved</em> ');
+                    $(this).find('h3').prepend('<em>Offline update data saved</em> ');
                 }
             });
             $('#offline_clear').html('<button id="js-clear-localStorage">Clear offline data</button>');
-- 
cgit v1.2.3


From d19497f5ff6150c3512b9103f418dc9965431a20 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Jan 2017 14:38:26 +0000
Subject: Remove offline banner when no longer necessary.

---
 web/cobrands/fixmystreet/offline.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 177e54e4d..c98d76210 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -15,6 +15,10 @@ fixmystreet.offlineBanner = (function() {
         return 'You are offline \u2013 <span>' + formText() + '</span> saved.';
     }
 
+    function remove() {
+        $('.top_banner--offline').slideUp();
+    }
+
     return {
         make: function(offline) {
             var num = fixmystreet.offlineData.getForms().length;
@@ -75,6 +79,10 @@ fixmystreet.offlineBanner = (function() {
         update: function() {
             $('.top_banner--offline').slideDown();
             $('#offline_forms span').text(formText());
+            var num = fixmystreet.offlineData.getForms().length;
+            if (num === 0) {
+                window.setTimeout(remove, 3000);
+            }
         },
         startProgress: function(l) {
             $('.top_banner--offline').slideDown();
@@ -85,6 +93,7 @@ fixmystreet.offlineBanner = (function() {
             cachedSoFar += 1;
             if (cachedSoFar === toCache) {
                 $('#offline_saving').text('Reports saved offline.');
+                window.setTimeout(remove, 3000);
             } else {
                 $('#offline_saving span').text(cachedSoFar);
             }
-- 
cgit v1.2.3


From 601392baa673a99ac351071f0686a05b6b9cf43c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Jan 2017 14:38:55 +0000
Subject: Require confirmation for clearing offline data.

---
 web/cobrands/fixmystreet/offline.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index c98d76210..7b9be4c6c 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -383,12 +383,14 @@ if ($('#offline_list').length) {
                     $(this).find('h3').prepend('<em>Offline update data saved</em> ');
                 }
             });
-            $('#offline_clear').html('<button id="js-clear-localStorage">Clear offline data</button>');
+            $('#offline_clear').css('margin-top', '5em').html('<button id="js-clear-localStorage">Clear offline data</button>');
             $('#js-clear-localStorage').click(function() {
-                fixmystreet.offline.removeReports(fixmystreet.offlineData.getCachedUrls());
-                fixmystreet.offlineData.clearForms();
-                localStorage.removeItem('/my/planned');
-                alert('Offline data cleared');
+                if (window.confirm("Are you sure?")) {
+                    fixmystreet.offline.removeReports(fixmystreet.offlineData.getCachedUrls());
+                    fixmystreet.offlineData.clearForms();
+                    localStorage.removeItem('/my/planned');
+                    alert('Offline data cleared');
+                }
             });
         }
     }
-- 
cgit v1.2.3


From 10f47d91cc37f05f738e3734f8e89b85bcd4fef9 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 16 Dec 2016 15:01:52 +0000
Subject: Avoid coloured report backgrounds on homepage

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

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 93e3cf201..a90eb8005 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1039,6 +1039,10 @@ input.final-submit {
 
 .item-list--front-page {
   border-bottom: none;
+
+  .item-list__item {
+    background-color: transparent;
+  }
 }
 
 .problem-header .update-img,
-- 
cgit v1.2.3


From b80c49adc9e769cdd6a41a6fef23dd5c9b1a578c Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 16 Dec 2016 15:04:54 +0000
Subject: Force .tablewrapper to use fixed column widths

Most noticeably, this fixes a long standing bug on the Oxfordshire
homepage where the "how to" and list of reports made the right-hand
edge of .content spill outside its parent.
---
 web/cobrands/sass/_layout.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 48fdf32c0..a390a4131 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -617,6 +617,7 @@ body.authpage {
   display:table;
   width:100%;
   padding: 0 0 1em;
+  table-layout: fixed;
   >div {
     display:table-cell;
     width:50%;
-- 
cgit v1.2.3


From d967ee5ef454c8e3b91812bc2280a3969d0d6baa Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Mon, 28 Nov 2016 12:50:45 +0000
Subject: Show response priorities in report list items

---
 templates/web/base/report/_item.html | 12 +++++++-----
 web/cobrands/sass/_base.scss         | 12 ++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 02457e5a0..dc4ccbf4e 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -13,6 +13,13 @@
         <div class="item-list__description">[% problem.detail | html %]</div>
     [% END %]
         <small>
+            [% IF NOT no_fixed AND problem.is_fixed %]
+                <span class="item-list__item__state">[% loc('Fixed') %]</span>
+            [% ELSIF NOT no_fixed AND problem.is_closed %]
+                <span class="item-list__item__state">[% loc('Closed') %]</span>
+            [% ELSIF problem.response_priority AND (c.user.has_permission_to('report_edit_priority', problem.bodies_str_ids) OR c.user.has_permission_to('report_inspect', problem.bodies_str_ids)) %]
+                <span class="item-list__item__state">[% problem.response_priority.name %]</span>
+            [% END %]
             [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
                 [%- prettify_dt( problem.confirmed, 1 ) %]
             [%- ELSE %] [%# Swedish cobrand fixamingata: %]
@@ -29,11 +36,6 @@
                 [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %]
                 [% END %]
             [% END %]
-            [% IF NOT no_fixed AND problem.is_fixed %]
-                [% loc('(fixed)') %]
-            [% ELSIF NOT no_fixed AND problem.is_closed %]
-                [% loc('(closed)') %]
-            [% END %]
         </small>
 
     [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index a90eb8005..3bb8715a1 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1033,6 +1033,18 @@ input.final-submit {
   }
 }
 
+.item-list__item__state {
+  font-size: 0.9em;
+  font-style: normal;
+  font-weight: bold;
+  padding: 0.2em 0.5em;
+  vertical-align: -0.1em;
+  background: #888;
+  color: #fff;
+  border-radius: 0.3em;
+  margin-right: 0.1em;
+}
+
 .item-list__item--empty p {
   margin: 0;
 }
-- 
cgit v1.2.3


From 21877e063f8ab9c5914adbc88c8210d2393671ae Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 22 Nov 2016 15:38:07 +0000
Subject: Add shortlist buttons to report lists.

This includes adding/removing reports from a user's shortlist, and
manual reordering of a shortlist with up/down buttons.

The backend code can cope with an item moving to any point in the list.
---
 perllib/FixMyStreet/App/Controller/Around.pm       |   2 +
 perllib/FixMyStreet/App/Controller/My.pm           |  75 +++++++++-
 perllib/FixMyStreet/App/Controller/Report/New.pm   |   8 ++
 perllib/FixMyStreet/App/Controller/Reports.pm      |  10 +-
 perllib/FixMyStreet/App/Controller/Root.pm         |   1 +
 perllib/FixMyStreet/DB/Result/User.pm              |   2 +
 t/app/controller/my_planned.t                      |   4 +-
 templates/web/base/my/planned.html                 |   4 +-
 templates/web/base/report/_item.html               |  33 +++++
 templates/web/base/report/_main.html               |   2 +-
 templates/web/base/reports/_list-filters.html      |   3 +
 web/cobrands/bristol/base.scss                     |   1 +
 web/cobrands/bristol/layout.scss                   |   1 -
 web/cobrands/bromley/base.scss                     |   1 +
 web/cobrands/bromley/layout.scss                   |   1 -
 web/cobrands/fixmystreet.com/_colours.scss         |   2 +-
 web/cobrands/fixmystreet/fixmystreet.js            |  99 ++++++++++++-
 .../images/icon-shortlist-active-hover.png         | Bin 0 -> 359 bytes
 .../images/icon-shortlist-active-hover.svg         |   1 +
 .../images/icon-shortlist-active-hover@2x.png      | Bin 0 -> 717 bytes
 .../fixmystreet/images/icon-shortlist-active.png   | Bin 0 -> 349 bytes
 .../fixmystreet/images/icon-shortlist-active.svg   |   1 +
 .../images/icon-shortlist-active@2x.png            | Bin 0 -> 669 bytes
 .../images/icon-shortlist-down-hover.png           | Bin 0 -> 122 bytes
 .../images/icon-shortlist-down-hover.svg           |   1 +
 .../images/icon-shortlist-down-hover@2x.png        | Bin 0 -> 159 bytes
 .../fixmystreet/images/icon-shortlist-down.png     | Bin 0 -> 109 bytes
 .../fixmystreet/images/icon-shortlist-down.svg     |   1 +
 .../fixmystreet/images/icon-shortlist-down@2x.png  | Bin 0 -> 138 bytes
 .../images/icon-shortlist-inactive-hover.png       | Bin 0 -> 514 bytes
 .../images/icon-shortlist-inactive-hover.svg       |   1 +
 .../images/icon-shortlist-inactive-hover@2x.png    | Bin 0 -> 1045 bytes
 .../fixmystreet/images/icon-shortlist-inactive.png | Bin 0 -> 326 bytes
 .../fixmystreet/images/icon-shortlist-inactive.svg |   1 +
 .../images/icon-shortlist-inactive@2x.png          | Bin 0 -> 649 bytes
 .../images/icon-shortlist-taken-hover.png          | Bin 0 -> 487 bytes
 .../images/icon-shortlist-taken-hover.svg          |   1 +
 .../images/icon-shortlist-taken-hover@2x.png       | Bin 0 -> 868 bytes
 .../fixmystreet/images/icon-shortlist-taken.png    | Bin 0 -> 324 bytes
 .../fixmystreet/images/icon-shortlist-taken.svg    |   1 +
 .../fixmystreet/images/icon-shortlist-taken@2x.png | Bin 0 -> 577 bytes
 .../fixmystreet/images/icon-shortlist-up-hover.png | Bin 0 -> 120 bytes
 .../fixmystreet/images/icon-shortlist-up-hover.svg |   1 +
 .../images/icon-shortlist-up-hover@2x.png          | Bin 0 -> 161 bytes
 .../fixmystreet/images/icon-shortlist-up.png       | Bin 0 -> 109 bytes
 .../fixmystreet/images/icon-shortlist-up.svg       |   1 +
 .../fixmystreet/images/icon-shortlist-up@2x.png    | Bin 0 -> 139 bytes
 web/cobrands/greenwich/base.scss                   |   1 +
 web/cobrands/greenwich/layout.scss                 |   1 -
 web/cobrands/oxfordshire/_colours.scss             |   3 +
 web/cobrands/oxfordshire/base.scss                 |   1 +
 web/cobrands/oxfordshire/layout.scss               |  13 +-
 web/cobrands/sass/_base.scss                       | 157 ++++++++++++++++++++-
 web/cobrands/sass/_mixins.scss                     |  12 ++
 web/cobrands/sass/_report_list_pins.scss           |  57 +-------
 55 files changed, 417 insertions(+), 87 deletions(-)
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active-hover.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active-hover.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active-hover@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-active@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down-hover.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down-hover.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down-hover@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-down@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-inactive@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken-hover@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-taken@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up-hover.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up-hover.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up-hover@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-up@2x.png

diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index b4f94bb35..96854b17b 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -291,6 +291,8 @@ sub ajax : Path('/ajax') {
     # assume this is not cacheable - may need to be more fine-grained later
     $c->res->header( 'Cache_Control' => 'max-age=0' );
 
+    $c->stash->{page} = 'around'; # Needed by _item.html
+
     # how far back should we go?
     my $all_pins = $c->get_param('all_pins') ? 1 : undef;
     my $interval = $all_pins ? undef : $c->cobrand->on_map_default_max_pin_age;
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index 51f1687ee..c26cdd5c8 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -3,6 +3,7 @@ use Moose;
 use namespace::autoclean;
 
 use JSON::MaybeXS;
+use List::MoreUtils qw(first_index);
 
 BEGIN { extends 'Catalyst::Controller'; }
 
@@ -30,8 +31,11 @@ sub begin : Private {
 sub my : Path : Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->forward('/auth/get_csrf_token');
+
     $c->stash->{problems_rs} = $c->cobrand->problems->search(
         { user_id => $c->user->id });
+    $c->forward('/reports/stash_report_sort', [ 'created-desc' ]);
     $c->forward('get_problems');
     if ($c->get_param('ajax')) {
         $c->detach('/reports/ajax', [ 'my/_problem-list.html' ]);
@@ -43,21 +47,54 @@ sub my : Path : Args(0) {
 sub planned : Local : Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->forward('/auth/get_csrf_token');
+
     $c->detach('/page_error_403_access_denied', [])
         unless $c->user->has_body_permission_to('planned_reports');
 
     $c->stash->{problems_rs} = $c->user->active_planned_reports;
+    $c->forward('planned_reorder');
+    $c->forward('/reports/stash_report_sort', [ 'shortlist' ]);
     $c->forward('get_problems');
     $c->forward('setup_page_data');
 }
 
+sub planned_reorder : Private {
+    my ($self, $c) = @_;
+
+    my @extra = grep { /^shortlist-(up|down|\d+)$/ } keys %{$c->req->params};
+    return unless @extra;
+    my ($reorder) = $extra[0] =~ /^shortlist-(up|down|\d+)$/;
+
+    my @shortlist = sort by_shortlisted $c->stash->{problems_rs}->all;
+
+    # Find where moving problem ID is
+    my $id = $c->get_param('id') || return;
+    my $curr_index = first_index { $_->id == $id } @shortlist;
+    return unless $curr_index > -1;
+
+    if ($reorder eq 'up' && $curr_index > 0) {
+        @shortlist[$curr_index-1,$curr_index] = @shortlist[$curr_index,$curr_index-1];
+    } elsif ($reorder eq 'down' && $curr_index < @shortlist-1) {
+        @shortlist[$curr_index,$curr_index+1] = @shortlist[$curr_index+1,$curr_index];
+    } elsif ($reorder >= 0 && $reorder <= @shortlist-1) { # Must be an index to move it
+        @shortlist[$curr_index,$reorder] = @shortlist[$reorder,$curr_index];
+    }
+
+    # Store new ordering
+    my $i = 1;
+    foreach (@shortlist) {
+        $_->set_extra_metadata('order', $i++);
+        $_->update;
+    }
+}
+
 sub get_problems : Private {
     my ($self, $c) = @_;
 
     my $p_page = $c->get_param('p') || 1;
 
     $c->forward( '/reports/stash_report_filter_status' );
-    $c->forward('/reports/stash_report_sort', [ 'created-desc' ]);
 
     my $pins = [];
     my $problems = [];
@@ -73,9 +110,12 @@ sub get_problems : Private {
         $c->stash->{filter_category} = $categories;
     }
 
+    my $rows = 50;
+    $rows = 5000 if $c->stash->{sort_key} eq 'shortlist'; # Want all reports
+
     my $rs = $c->stash->{problems_rs}->search( $params, {
         order_by => $c->stash->{sort_order},
-        rows => 50
+        rows => $rows,
     } )->include_comment_counts->page( $p_page );
 
     while ( my $problem = $rs->next ) {
@@ -83,6 +123,9 @@ sub get_problems : Private {
         push @$pins, $problem->pin_data($c, 'my', private => 1);
         push @$problems, $problem;
     }
+
+    @$problems = sort by_shortlisted @$problems if $c->stash->{sort_key} eq 'shortlist';
+
     $c->stash->{problems_pager} = $rs->pager;
     $c->stash->{problems} = $problems;
     $c->stash->{pins} = $pins;
@@ -134,27 +177,45 @@ sub planned_change : Path('planned/change') {
     my ($self, $c) = @_;
     $c->forward('/auth/check_csrf_token');
 
+    $c->go('planned') if grep { /^shortlist-(up|down|\d+)$/ } keys %{$c->req->params};
+
     my $id = $c->get_param('id');
     $c->forward( '/report/load_problem_or_display_error', [ $id ] );
 
-    my $change = $c->get_param('change');
+    my $add = $c->get_param('shortlist-add');
+    my $remove = $c->get_param('shortlist-remove');
     $c->detach('/page_error_403_access_denied', [])
-        unless $change && $change =~ /add|remove/;
+        unless $add || $remove;
 
-    if ($change eq 'add') {
+    if ($add) {
         $c->user->add_to_planned_reports($c->stash->{problem});
-    } elsif ($change eq 'remove') {
+    } elsif ($remove) {
         $c->user->remove_from_planned_reports($c->stash->{problem});
     }
 
     if ($c->get_param('ajax')) {
         $c->res->content_type('application/json; charset=utf-8');
-        $c->res->body(encode_json({ outcome => $change }));
+        $c->res->body(encode_json({ outcome => $add ? 'add' : 'remove' }));
     } else {
         $c->res->redirect( $c->uri_for_action('report/display', $id) );
     }
 }
 
+sub by_shortlisted {
+    my $a_order = $a->get_extra_metadata('order') || 0;
+    my $b_order = $b->get_extra_metadata('order') || 0;
+    if ($a_order && $b_order) {
+        $a_order <=> $b_order;
+    } elsif ($a_order) {
+        -1; # Want non-ordered to come last
+    } elsif ($b_order) {
+        1; # Want non-ordered to come last
+    } else {
+        # Default to order added to planned reports
+        $a->user_planned_reports->first->id <=> $b->user_planned_reports->first->id;
+    }
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index e2569d2e9..6d90b6ee9 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -83,6 +83,14 @@ sub report_new : Path : Args(0) {
     $c->forward('initialize_report');
     $c->forward('/auth/get_csrf_token');
 
+    my @shortlist = grep { /^shortlist-(add|remove)-(\d+)$/ } keys %{$c->req->params};
+    if (@shortlist) {
+        my ($cmd, $id) = $shortlist[0] =~ /^shortlist-(add|remove)-(\d+)$/;
+        $c->req->params->{id} = $id;
+        $c->req->params->{"shortlist-$cmd"} = 1;
+        $c->detach('/my/planned_change');
+    }
+
     # work out the location for this report and do some checks
     # Also show map if we're just updating the filters
     return $c->forward('redirect_to_around')
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index f2c43b5ee..2635b7b7a 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -108,6 +108,8 @@ Show the summary page for a particular ward.
 sub ward : Path : Args(2) {
     my ( $self, $c, $body, $ward ) = @_;
 
+    $c->forward('/auth/get_csrf_token');
+
     $c->forward( 'body_check', [ $body ] );
     $c->forward( 'ward_check', [ $ward ] )
         if $ward;
@@ -513,13 +515,17 @@ sub stash_report_sort : Private {
     );
 
     my $sort = $c->get_param('sort') || $default;
-    $sort = $default unless $sort =~ /^((updated|created)-(desc|asc)|comments-desc)$/;
+    $sort = $default unless $sort =~ /^((updated|created)-(desc|asc)|comments-desc|shortlist)$/;
+    $c->stash->{sort_key} = $sort;
+
+    # Going to do this sorting code-side
+    $sort = 'created-desc' if $sort eq 'shortlist';
+
     $sort =~ /^(updated|created|comments)-(desc|asc)$/;
     my $order_by = $types{$1} || $1;
     my $dir = $2;
     $order_by = { -desc => $order_by } if $dir eq 'desc';
 
-    $c->stash->{sort_key} = $sort;
     $c->stash->{sort_order} = $order_by;
     return 1;
 }
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
index 20a871b17..4f098dfc3 100644
--- a/perllib/FixMyStreet/App/Controller/Root.pm
+++ b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -58,6 +58,7 @@ sub index : Path : Args(0) {
         return;
     }
 
+    $c->forward('/auth/get_csrf_token');
 }
 
 =head2 default
diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index 72acb6940..b34be674a 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -379,6 +379,8 @@ around add_to_planned_reports => sub {
 around remove_from_planned_reports => sub {
     my ($orig, $self, $report) = @_;
     $self->user_planned_reports->active->for_report($report->id)->remove();
+    $report->unset_extra_metadata('order');
+    $report->update;
 };
 
 sub active_planned_reports {
diff --git a/t/app/controller/my_planned.t b/t/app/controller/my_planned.t
index 7bd1dd2cd..d66673589 100644
--- a/t/app/controller/my_planned.t
+++ b/t/app/controller/my_planned.t
@@ -40,9 +40,9 @@ $mech->content_contains('Test Title');
 
 $mech->get_ok($problem->url);
 $mech->content_contains('Shortlisted');
-$mech->submit_form_ok({ with_fields => { change => 'remove' } });
+$mech->submit_form_ok({ with_fields => { 'shortlist-remove' => 1 } });
 $mech->content_contains('Shortlist');
-$mech->submit_form_ok({ with_fields => { change => 'add' } });
+$mech->submit_form_ok({ with_fields => { 'shortlist-add' => 1 } });
 $mech->content_contains('Shortlisted');
 
 done_testing();
diff --git a/templates/web/base/my/planned.html b/templates/web/base/my/planned.html
index eb67247c4..d1a6b7b1b 100644
--- a/templates/web/base/my/planned.html
+++ b/templates/web/base/my/planned.html
@@ -22,11 +22,11 @@
 [% END %]
 
 <section class="full-width">
-[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 %]
+[% INCLUDE "reports/_list-filters.html", use_form_wrapper = 1 shortlist = 1 %]
 <div class="js-pagination">
 [% INCLUDE 'pagination.html', pager = problems_pager, param = 'p' %]
 </div>
-[% INCLUDE 'my/_problem-list.html' %]
+[% INCLUDE 'my/_problem-list.html' shortlist = 1 %]
 </section>
 
         </div>
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index dc4ccbf4e..e233ff09f 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -2,6 +2,30 @@
 [% PROCESS 'admin/report_blocks.html' ~%]
 [% END ~%]
 
+[% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) ~%]
+    [% item_extra_class = "item-list__item--indented" ~%]
+    [% item_action = BLOCK ~%]
+      <input type="submit" value="1"
+        data-label-remove="[% loc('Remove from shortlist') %]"
+        data-label-add="[% loc('Add to shortlist') %]"
+      [% IF c.user.is_planned_report(problem) ~%]
+        name="shortlist-remove" title="[% loc('Remove from shortlist') %]" class="item-list__item__shortlist-remove"
+      [%~ ELSE ~%]
+        name="shortlist-add" title="[% loc('Add to shortlist') %]" class="item-list__item__shortlist-[% IF problem.shortlisted_user %]take[% ELSE %]add[% END %]"
+      [%~ END ~%]
+      >
+    [%~ END %]
+[% END %]
+
+[% IF shortlist %]
+    [% item_extra_class = "item-list__item--indented item-list__item--act-and-sort" %]
+    [% item_action = BLOCK %]
+        [% item_action %]
+        <input type="submit" name="shortlist-up" value="[% loc('Up one') %]" title="[% loc('Up one') %]" class="item-list__item__shortlist-up" [% IF loop.first %]disabled[% END %]>
+        <input type="submit" name="shortlist-down" value="[% loc('Down one') %]" title="[% loc('Down one') %]" class="item-list__item__shortlist-down" [% IF loop.last %]disabled[% END %]>
+    [% END %]
+[% END %]
+
 <li class="item-list__item item-list--reports__item [% item_extra_class %]"
     data-report-id="[% problem.id | html %]" data-lastupdate="[% problem.lastupdate %]">
 <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">
@@ -87,4 +111,13 @@
 
 
 </a>
+[% IF item_action AND page != 'around' %]
+    <form method="post" action="/my/planned/change">
+        <input type="hidden" name="id" value="[% problem.id %]">
+        <input type="hidden" name="token" value="[% csrf_token %]">
+        [% item_action %]
+    </form>
+[% ELSIF item_action ~%]
+    [% item_action.replace('("shortlist-[^"]*)', '$1-' _ problem.id) %]
+[% END ~%]
 </li>
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index d5224f23e..e232a575c 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -11,7 +11,7 @@
 <form method="post" action="/my/planned/change" id="planned_form" class="hidden-label-target">
     <input type="hidden" name="id" value="[% problem.id %]">
     <input type="hidden" name="token" value="[% csrf_token %]">
-    <input type="hidden" name="change" value="[% IF c.user.is_planned_report(problem) %]remove[% ELSE %]add[% END %]">
+    <input type="hidden" name="[% IF c.user.is_planned_report(problem) %]shortlist-remove[% ELSE %]shortlist-add[% END %]" value="1">
     <p><input
         type="submit"
         id="shortlist-report"
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 9c2a74e57..05fe6123b 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -32,6 +32,9 @@
         <p class="report-list-filters">
             <label for="sort">[% loc('Sort by') %]</label>
             <select class="form-control" name="sort" id="sort">
+              [% IF shortlist %]
+                <option value="shortlist"[% ' selected' IF sort_key == 'shortlist' %]>[% loc('Manual order') %]</option>
+              [% END %]
                 <option value="created-desc"[% ' selected' IF sort_key == 'created-desc' %]>[% loc('Newest') %]</option>
                 <option value="created-asc"[% ' selected' IF sort_key == 'created-asc' %]>[% loc('Oldest') %]</option>
                 <option value="updated-desc"[% ' selected' IF sort_key == 'updated-desc' %]>[% loc('Recently updated') %]</option>
diff --git a/web/cobrands/bristol/base.scss b/web/cobrands/bristol/base.scss
index 746e17064..c92b46ec3 100644
--- a/web/cobrands/bristol/base.scss
+++ b/web/cobrands/bristol/base.scss
@@ -4,6 +4,7 @@
 @import "../sass/mixins";
 
 @import "../sass/base";
+@import "../sass/report_list_pins";
 
 // Put the BCC logo in place, and reveal the 'bristol.gov.uk' text alongside it
 #site-logo {
diff --git a/web/cobrands/bristol/layout.scss b/web/cobrands/bristol/layout.scss
index 02894e083..3b9dfa1b6 100644
--- a/web/cobrands/bristol/layout.scss
+++ b/web/cobrands/bristol/layout.scss
@@ -1,7 +1,6 @@
 @import "_colours";
 @import "_fonts";
 @import "../sass/layout";
-@import "../sass/report_list_pins";
 
 #site-header {
   background-color: $g1;
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 5661632a3..0d028d190 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -4,6 +4,7 @@
 @import "../sass/mixins";
 
 @import "../sass/base";
+@import "../sass/report_list_pins";
 
 // Override the site logo
 #site-logo{
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index a8c1f35ce..71d7cbc47 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -1,6 +1,5 @@
 @import "_colours";
 @import "../sass/layout";
-@import "../sass/report_list_pins";
 
 // Alter the logo and the header on every page *but* the map page. On the map
 // page it stays small like in base.css
diff --git a/web/cobrands/fixmystreet.com/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss
index 908356d36..c72e48d45 100644
--- a/web/cobrands/fixmystreet.com/_colours.scss
+++ b/web/cobrands/fixmystreet.com/_colours.scss
@@ -20,6 +20,6 @@ $col_fixed_label: #00BD08;
 $col_fixed_label_dark: #4B8304;
 
 $itemlist_item_background: #f6f6f6;
-$itemlist_item_background_hover: mix(#fff, $primary, 50%);
+$itemlist_item_background_hover: mix(#fff, $primary, 70%);
 
 $layout_front_stats_color: #222;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 190978d45..1a69f895e 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -213,6 +213,15 @@ fixmystreet.geolocate = {
     }
 };
 
+fixmystreet.update_list_item_buttons = function($list) {
+    if (!$list) {
+        return;
+    }
+  $list.find('[name="shortlist-up"], [name="shortlist-down"]').prop('disabled', false);
+  $list.children(':first-child').find('[name="shortlist-up"]').prop('disabled', true);
+  $list.children(':last-child').find('[name="shortlist-down"]').prop('disabled', true);
+};
+
 fixmystreet.set_up = fixmystreet.set_up || {};
 $.extend(fixmystreet.set_up, {
   basics: function() {
@@ -227,7 +236,7 @@ $.extend(fixmystreet.set_up, {
     $('#pc').focus();
 
     // In case we've come here by clicking back to a form that disabled a submit button
-    $('input[type=submit]').removeAttr('disabled');
+    $('form.validate input[type=submit]').removeAttr('disabled');
 
     $('[data-confirm]').on('click', function() {
         return confirm(this.getAttribute('data-confirm'));
@@ -313,7 +322,6 @@ $.extend(fixmystreet.set_up, {
         }
         e.preventDefault();
         var $form = $(this),
-            $change = $form.find("input[name='change']" ),
             $submit = $form.find("input[type='submit']" ),
             $labels = $('label[for="' + $submit.attr('id') + '"]'),
             problemId = $form.find("input[name='id']").val(),
@@ -324,18 +332,17 @@ $.extend(fixmystreet.set_up, {
 
         $.post(this.action, data, function(data) {
             if (data.outcome == 'add') {
-                changeValue = "remove";
+                $form.find("input[name='shortlist-add']" ).attr('name', 'shortlist-remove');
                 buttonLabel = $submit.data('label-remove');
                 buttonValue = $submit.data('value-remove');
                 $('.shortlisted-status').remove();
                 $(document).trigger('shortlist-add', problemId);
             } else if (data.outcome == 'remove') {
-                changeValue = "add";
+                $form.find("input[name='shortlist-remove']" ).attr('name', 'shortlist-add');
                 buttonLabel = $submit.data('label-add');
                 buttonValue = $submit.data('value-add');
                 $(document).trigger('shortlist-remove', problemId);
             }
-            $change.val(changeValue);
             $submit.val(buttonValue).attr('aria-label', buttonLabel);
             $labels.text(buttonValue).attr('aria-label', buttonLabel);
         });
@@ -474,6 +481,88 @@ $.extend(fixmystreet.set_up, {
       $("#js-change-duplicate-report").click(refresh_duplicate_list);
   },
 
+  list_item_actions: function() {
+    function toggle_shortlist(btn, sw, id) {
+        btn.attr('class', 'item-list__item__shortlist-' + sw);
+        btn.attr('title', btn.data('label-' + sw));
+        if (id) {
+            sw += '-' + id;
+        }
+        btn.attr('name', 'shortlist-' + sw);
+    }
+
+    $('.item-list').on('click', ':submit', function(e) {
+      e.preventDefault();
+
+      var $submitButton = $(this);
+      var whatUserWants = $submitButton.prop('name');
+      var data;
+      var $item;
+      var $list;
+      var $hiddenInput;
+      var report_id;
+      if (fixmystreet.page === 'around') {
+          // Deal differently because one big form
+          var parts = whatUserWants.split('-');
+          whatUserWants = parts[0] + '-' + parts[1];
+          report_id = parts[2];
+          var token = $('[name=token]').val();
+          data = whatUserWants + '=1&token=' + token + '&id=' + report_id;
+      } else {
+          var $form = $(this).parents('form');
+          $item = $form.parent('.item-list__item');
+          $list = $item.parent('.item-list');
+
+          // The server expects to be told which button/input triggered the form
+          // submission. But $form.serialize() doesn't know that. So we inject a
+          // hidden input into the form, that can pass the name and value of the
+          // submit button to the server, as it expects.
+          $hiddenInput = $('<input>').attr({
+            type: 'hidden',
+            name: whatUserWants,
+            value: $submitButton.prop('value')
+          }).appendTo($form);
+          data = $form.serialize() + '&ajax=1';
+      }
+
+      // Update UI while the ajax request is sent in the background.
+      if ('shortlist-down' === whatUserWants) {
+        $item.insertAfter( $item.next() );
+      } else if ('shortlist-up' === whatUserWants) {
+        $item.insertBefore( $item.prev() );
+      } else if ('shortlist-remove' === whatUserWants) {
+          toggle_shortlist($submitButton, 'add', report_id);
+      } else if ('shortlist-add' === whatUserWants) {
+          toggle_shortlist($submitButton, 'remove', report_id);
+      }
+
+      // Items have moved around. We need to make sure the "up" button on the
+      // first item, and the "down" button on the last item, are disabled.
+      fixmystreet.update_list_item_buttons($list);
+
+      $.ajax({
+        url: '/my/planned/change',
+        type: 'POST',
+        data: data
+      }).fail(function() {
+        // Undo the UI changes we made.
+        if ('shortlist-down' === whatUserWants) {
+          $item.insertBefore( $item.prev() );
+        } else if ('shortlist-up' === whatUserWants) {
+          $item.insertAfter( $item.next() );
+        } else if ('shortlist-remove' === whatUserWants) {
+          toggle_shortlist($submitButton, 'remove', report_id);
+        } else if ('shortlist-add' === whatUserWants) {
+          toggle_shortlist($submitButton, 'add', report_id);
+        }
+        fixmystreet.update_list_item_buttons($list);
+      }).complete(function() {
+        if ($hiddenInput) {
+          $hiddenInput.remove();
+        }
+      });
+    });
+  },
 
   contribute_as: function() {
     $('.content').on('change', '.js-contribute-as', function(){
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.png b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.png
new file mode 100644
index 000000000..a2574d407
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.svg b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.svg
new file mode 100644
index 000000000..054b98134
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>icon-shortlist-active-hover</title><defs><path d="M5.1 22.832l6.9-3.627 6.9 3.627c.286-.192.565-.395.835-.61l-1.318-7.68L24 9.103c-.093-.334-.2-.66-.32-.983l-7.714-1.122L12.518.01C12.346.005 12.173 0 12 0c-.173 0-.346.004-.518.01L8.034 7 .32 8.118c-.12.323-.227.65-.32.983l5.583 5.443-1.318 7.68c.27.214.55.417.836.61z" id="a"/><mask id="b" x="0" y="0" width="24" height="22.832" fill="#fff"><use xlink:href="#a"/></mask></defs><use mask="url(#b)" xlink:href="#a" stroke="#000" stroke-width="4" fill="#000" fill-rule="evenodd" stroke-opacity=".2" fill-opacity=".15"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active-hover@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover@2x.png
new file mode 100644
index 000000000..b52123a4a
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-active-hover@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active.png b/web/cobrands/fixmystreet/images/icon-shortlist-active.png
new file mode 100644
index 000000000..e35ecb179
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-active.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active.svg b/web/cobrands/fixmystreet/images/icon-shortlist-active.svg
new file mode 100644
index 000000000..fcf677a0f
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-active.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-active</title><path d="M5.1 22.832l6.9-3.627 6.9 3.627c.286-.192.565-.395.835-.61l-1.318-7.68L24 9.103c-.093-.334-.2-.66-.32-.983l-7.714-1.122L12.518.01C12.346.005 12.173 0 12 0c-.173 0-.346.004-.518.01L8.034 7 .32 8.118c-.12.323-.227.65-.32.983l5.583 5.443-1.318 7.68c.27.214.55.417.836.61z" fill="#00BD08" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-active@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-active@2x.png
new file mode 100644
index 000000000..bcd5d8c0d
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-active@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.png b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.png
new file mode 100644
index 000000000..c2151f55e
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.svg b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.svg
new file mode 100644
index 000000000..c8ab5b2b3
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover.svg
@@ -0,0 +1 @@
+<svg width="24" height="14" viewBox="0 0 24 14" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-down-hover</title><path d="M10 6h4V0h-4v6zm2 8l8-8H4l8 8z" fill="#00BD08" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down-hover@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover@2x.png
new file mode 100644
index 000000000..3deb4c1d1
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-down-hover@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down.png b/web/cobrands/fixmystreet/images/icon-shortlist-down.png
new file mode 100644
index 000000000..df700f7cd
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-down.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down.svg b/web/cobrands/fixmystreet/images/icon-shortlist-down.svg
new file mode 100644
index 000000000..495f7d647
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-down.svg
@@ -0,0 +1 @@
+<svg width="24" height="14" viewBox="0 0 24 14" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-down</title><path d="M10 6h4V0h-4v6zm2 8l8-8H4l8 8z" fill="#000" fill-rule="evenodd" fill-opacity=".3"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-down@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-down@2x.png
new file mode 100644
index 000000000..cfdadf2e4
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-down@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.png b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.png
new file mode 100644
index 000000000..897634bee
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.svg b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.svg
new file mode 100644
index 000000000..05239ef51
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>icon-shortlist-inactive-hover</title><defs><path d="M5.1 22.832l6.9-3.627 6.9 3.627c.286-.192.565-.395.835-.61l-1.318-7.68L24 9.103c-.093-.334-.2-.66-.32-.983l-7.714-1.122L12.518.01C12.346.005 12.173 0 12 0c-.173 0-.346.004-.518.01L8.034 7 .32 8.118c-.12.323-.227.65-.32.983l5.583 5.443-1.318 7.68c.27.214.55.417.836.61z" id="a"/><mask id="b" x="0" y="0" width="24" height="22.832" fill="#fff"><use xlink:href="#a"/></mask></defs><use mask="url(#b)" xlink:href="#a" stroke-width="4" stroke="#00BD08" fill="#00BD08" fill-rule="evenodd" fill-opacity=".25"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover@2x.png
new file mode 100644
index 000000000..b561473fd
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-inactive-hover@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive.png b/web/cobrands/fixmystreet/images/icon-shortlist-inactive.png
new file mode 100644
index 000000000..66d9684fb
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-inactive.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive.svg b/web/cobrands/fixmystreet/images/icon-shortlist-inactive.svg
new file mode 100644
index 000000000..b2709859e
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-inactive.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>icon-shortlist-inactive</title><defs><path d="M5.1 22.832l6.9-3.627 6.9 3.627c.286-.192.565-.395.835-.61l-1.318-7.68L24 9.103c-.093-.334-.2-.66-.32-.983l-7.714-1.122L12.518.01C12.346.005 12.173 0 12 0c-.173 0-.346.004-.518.01L8.034 7 .32 8.118c-.12.323-.227.65-.32.983l5.583 5.443-1.318 7.68c.27.214.55.417.836.61z" id="a"/><mask id="b" x="0" y="0" width="24" height="22.832" fill="#fff"><use xlink:href="#a"/></mask></defs><use mask="url(#b)" xlink:href="#a" stroke="#000" stroke-width="4" fill="none" fill-rule="evenodd" stroke-opacity=".3"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-inactive@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-inactive@2x.png
new file mode 100644
index 000000000..47b86d144
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-inactive@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.png b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.png
new file mode 100644
index 000000000..0069de106
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.svg b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.svg
new file mode 100644
index 000000000..b9442e004
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-taken-hover</title><g fill="none" fill-rule="evenodd"><path d="M4.095 19.326l5.537-2.91 5.537 2.91c.23-.153.454-.316.67-.488l-1.057-6.165 4.48-4.368c-.074-.267-.16-.53-.255-.788l-6.192-.9-2.77-5.61C9.91 1.004 9.772 1 9.633 1c-.14 0-.278.003-.415.008l-2.77 5.61-6.19.9c-.097.257-.182.52-.257.787l4.48 4.368-1.056 6.165c.216.172.44.335.67.488z" fill="#00BD08"/><path d="M17.777 17.18c.142-.055.277-.118.402-.187.048-.026.102-.04.157-.04h.176c.057 0 .112.014.16.042 1.935.496 3.733 1.535 5.206 3.007.064.064.1.154.1.247L24 21.64c0 .19-.15.346-.336.346H8.336c-.185 0-.336-.156-.336-.346l-.02-1.393c0-.094.038-.183.103-.248.246-.246.5-.48.765-.7l.784-.414 4.335 2.28L17 21l.98-2.63-.203-1.19zm-.294-1.713c1.465-.742 2.498-2.538 2.498-4.635v-.167l-2.845 2.772.348 2.03z" fill-opacity=".3" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover@2x.png
new file mode 100644
index 000000000..3e8bbcd58
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-taken-hover@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken.png b/web/cobrands/fixmystreet/images/icon-shortlist-taken.png
new file mode 100644
index 000000000..f332d52f1
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-taken.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken.svg b/web/cobrands/fixmystreet/images/icon-shortlist-taken.svg
new file mode 100644
index 000000000..85154a8fb
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-taken.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-taken</title><path d="M12.167 5.303l-2.12-4.295C9.91 1.003 9.77 1 9.632 1c-.14 0-.278.003-.415.008l-2.77 5.61-6.19.9c-.097.257-.182.52-.257.787l4.48 4.368-1.056 6.165c.216.172.44.335.67.488L7.91 17.32c1.074-.93 2.244-1.644 3.47-2.116-.867-1.217-1.39-2.783-1.39-4.49 0-2.178.848-4.124 2.177-5.41zm6.495 11.686c.004 0 .008.003.012.005 1.934.496 3.732 1.535 5.205 3.007.064.064.1.154.1.247L24 21.64c0 .19-.15.346-.336.346H8.336c-.185 0-.336-.156-.336-.346l-.02-1.393c0-.094.038-.183.103-.248 1.477-1.476 3.28-2.516 5.22-3.012.806.473 1.716.74 2.678.74.965 0 1.876-.268 2.682-.74zm-2.68-1.158c2.208 0 4-2.24 4-5 0-2.762-1.792-5-4-5-2.21 0-4 2.238-4 5 0 2.76 1.79 5 4 5z" fill="#000" fill-rule="evenodd" fill-opacity=".3"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-taken@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-taken@2x.png
new file mode 100644
index 000000000..1c5759701
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-taken@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.png b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.png
new file mode 100644
index 000000000..d518fa029
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.svg b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.svg
new file mode 100644
index 000000000..fe3a941e1
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover.svg
@@ -0,0 +1 @@
+<svg width="24" height="14" viewBox="0 0 24 14" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-up-hover</title><path d="M10 8h4v6h-4V8zm2-8l8 8H4l8-8z" fill="#00BD08" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up-hover@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover@2x.png
new file mode 100644
index 000000000..233864de9
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-up-hover@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up.png b/web/cobrands/fixmystreet/images/icon-shortlist-up.png
new file mode 100644
index 000000000..09ce57064
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-up.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up.svg b/web/cobrands/fixmystreet/images/icon-shortlist-up.svg
new file mode 100644
index 000000000..c99767267
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-up.svg
@@ -0,0 +1 @@
+<svg width="24" height="14" viewBox="0 0 24 14" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlist-up</title><path d="M10 8h4v6h-4V8zm2-8l8 8H4l8-8z" fill="#000" fill-rule="evenodd" fill-opacity=".3"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-up@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-up@2x.png
new file mode 100644
index 000000000..922cc0a94
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-up@2x.png differ
diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss
index 756b2d60a..0c52bd5da 100644
--- a/web/cobrands/greenwich/base.scss
+++ b/web/cobrands/greenwich/base.scss
@@ -4,6 +4,7 @@
 @import "../sass/mixins";
 
 @import "../sass/base";
+@import "../sass/report_list_pins";
 
 body.frontpage #site-logo,
 #site-logo
diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss
index 54150cfd4..db06c9424 100644
--- a/web/cobrands/greenwich/layout.scss
+++ b/web/cobrands/greenwich/layout.scss
@@ -1,7 +1,6 @@
 @import "_colours";
 @import "_fonts";
 @import "../sass/layout";
-@import "../sass/report_list_pins";
 
 $fixed_page_width: 990px;
 
diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss
index a8a78dc6e..ba0597bb8 100644
--- a/web/cobrands/oxfordshire/_colours.scss
+++ b/web/cobrands/oxfordshire/_colours.scss
@@ -25,6 +25,9 @@ $col_click_map: $oxfordshire_lt_green;
 $col_fixed_label: $oxfordshire_lt_green;
 $col_fixed_label_dark: mix(#000, $oxfordshire_lt_green, 50%);
 
+$itemlist_item_background: $oxfordshire_very_light_green;
+$itemlist_item_background_hover: #e3f1d5; // darker version of $oxfordshire_very_light_green
+
 // Oxfordshire have toasty orange buttons
 
 $oxfordshire_button_base: #F35A0E;
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 0cc621310..49a1ac66c 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -4,6 +4,7 @@
 
 @import "../sass/base";
 @import "../sass/top-banner";
+@import "../sass/report_list_pins";
 
 #site-header {
   background: none;
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 22edca768..726b298ff 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -4,7 +4,6 @@ $mappage-header-height: 64px;
 
 @import "_colours";
 @import "../sass/layout";
-@import "../sass/report_list_pins";
 
 body, body a {
   font-family:"Trebuchet MS",Arial, Helvetica, sans-serif;
@@ -231,20 +230,14 @@ body.mappage {
   background-color: #deead2;
 }
 
-.item-list--reports {
-    li:after {
-        background-color: $oxfordshire_mid_grey_green;
-    }
-
-    h3 {
-        color: $oxfordshire_link_colour;
-    }
+.item-list--reports h3 {
+  color: $oxfordshire_link_colour;
 }
 
 h4.static-with-rule {
   margin-top: 1em; // down from default 2em, avoid extra space between heading and .council_info_box
   margin-bottom: 0; // no space between this and the .item-list items
-  background: transparent; // rather than light grey
+  // TODO background: transparent; // rather than light grey
   padding: 0.75em 1em * (1/0.875); // compensate for 0.875 font-size
 }
 
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 3bb8715a1..5d6176add 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1013,6 +1013,152 @@ input.final-submit {
   }
 }
 
+// A version where the normal padding of the list-item is tweaked to
+// make room for an icon or a button next to the report details.
+.item-list__item--indented {
+  position: relative;
+  margin: 0; // reset 0.25em margin-top on default item-list__item
+  padding: 0;
+  border-top: 1px solid #e5e5e5; // can't apply border to `a` because of border-left
+
+  a {
+    display: block;
+    padding: 1em;
+    padding-#{$left}: 2.5em; // make space for background image
+    border-#{$left}: solid 1em transparent; // inset background image 1em from the left
+    background: transparent;
+  }
+
+  // Trigger hover style even when hovering over sibling item-action-button
+  &:hover a {
+    background-color: $itemlist_item_background_hover;
+  }
+
+  h3 {
+    color: inherit; // Some cobrands might want to override with $primary for a more colourful list
+    margin: 0 0 0.2em 0;
+    padding-top: 0; // override .item-list__heading
+    line-height: 1.3em; // override .item-list__heading
+  }
+
+  p {
+    margin: 0;
+    font-size: 0.8em;
+    color: #777;
+  }
+}
+
+// Add this to your .item-list__item--indented element if you
+// need to display both an action button *and* up/down arrows
+.item-list__item--act-and-sort {
+    a {
+        padding-#{$left}: 4.5em; // make space for the extra buttons
+    }
+
+    .item-list__item__shortlist-up,
+    .item-list__item__shortlist-down {
+        width: 36px; // down from 48px
+        left: 3.5em; // up from 1em
+    }
+}
+
+%list-item-action-button {
+  position: absolute;
+  left: 1em; // match the padding on the `a` element
+  top: 50%;
+  margin-top: -24px; // vertically center
+  margin-left: -12px; // horizontally center
+
+  display: block;
+  width: 48px;
+  font-size: 1em;
+
+  padding: 0;
+  border: none;
+  background: transparent;
+
+  overflow: hidden; // hide button text
+  height: 0;
+  padding-top: 48px;
+
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: 24px 24px;
+}
+
+.item-list__item__shortlist-add {
+  @extend %list-item-action-button;
+  @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-inactive');
+
+  &:hover,
+  &:focus {
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-inactive-hover');
+  }
+}
+
+.item-list__item__shortlist-remove {
+  @extend %list-item-action-button;
+  @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-active');
+
+  &:hover,
+  &:focus {
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-active-hover');
+  }
+}
+
+.item-list__item__shortlist-take {
+  @extend %list-item-action-button;
+  @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-taken');
+
+  &:hover,
+  &:focus {
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-taken-hover');
+  }
+}
+
+.item-list__item__shortlist-up {
+  @extend %list-item-action-button;
+
+  padding-top: 24px; // half the normal height, because shorter icon
+  background-size: 24px 14px;
+
+  @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-up');
+
+  &:hover,
+  &:focus {
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-up-hover');
+  }
+
+  &[disabled] {
+    opacity: 0.5;
+    cursor: default;
+
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-up');
+  }
+}
+
+.item-list__item__shortlist-down {
+  @extend %list-item-action-button;
+
+  margin-top: 0; // this is the "lower" arrow, so no need to offset vertical position
+  padding-top: 24px; // half the normal height, because shorter icon
+  background-size: 24px 14px;
+
+  @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-down');
+
+  &:hover,
+  &:focus {
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-down-hover');
+  }
+
+  &[disabled] {
+    opacity: 0.5;
+    cursor: default;
+
+    @include high-dpi-background-image('/cobrands/fixmystreet/images/icon-shortlist-down');
+  }
+}
+
 .item-list__heading {
   font-size: 1em;
   font-weight: normal;
@@ -1045,8 +1191,15 @@ input.final-submit {
   margin-right: 0.1em;
 }
 
-.item-list__item--empty p {
-  margin: 0;
+.item-list__item--empty {
+  background: none;
+  color: #777;
+
+  p {
+    margin: 0;
+    padding: 1em;
+    text-align: center;
+  }
 }
 
 .item-list--front-page {
diff --git a/web/cobrands/sass/_mixins.scss b/web/cobrands/sass/_mixins.scss
index 2b05b3c21..8b6114aec 100644
--- a/web/cobrands/sass/_mixins.scss
+++ b/web/cobrands/sass/_mixins.scss
@@ -171,3 +171,15 @@ $right: right;
   -ms-flex-align: $alignment;
   align-items: $alignment;
 }
+
+@mixin high-dpi-background-image($path) {
+  background-image: url("#{$path}.png");
+
+  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+    background-image: url("#{$path}@2x.png");
+  }
+
+  @media screen {
+    background-image: url("#{$path}.svg"), none;
+  }
+}
diff --git a/web/cobrands/sass/_report_list_pins.scss b/web/cobrands/sass/_report_list_pins.scss
index eaeefbc10..3dae2cf84 100644
--- a/web/cobrands/sass/_report_list_pins.scss
+++ b/web/cobrands/sass/_report_list_pins.scss
@@ -1,15 +1,11 @@
+// Like .item-list__item--indented except with a pin icon baked in!
 .item-list__item--with-pin {
-  position: relative;
-  margin: 0;
-  padding: 0;
-  background: none;
+  @extend .item-list__item--indented;
 
   a {
-    display: block;
-    padding: 1em;
-    padding-#{$left}: 3em;
-    border-#{$left}: solid 1em transparent;
-    background: transparent url(/i/pin-yellow-small.png) no-repeat $left center;
+    background-image: url(/i/pin-yellow-small.png);
+    background-repeat: no-repeat;
+    background-position: $left center;
   }
 
   &.yellow a {
@@ -24,31 +20,6 @@
   &.grey a {
       background-image: url(/i/pin-grey-small.png);
   }
-
-  &:after {
-    content: "";
-    display: block;
-    height: 1px;
-    position: absolute;
-    #{$left}: 3em;
-    #{$right}: 0;
-    bottom: 0;
-    background-color: #e5e5e5;
-  }
-
-  h3, p {
-    margin: 0;
-  }
-
-  h3 {
-    color: $primary;
-    margin-bottom: 0.2em;
-  }
-
-  p {
-    font-size: 0.8em;
-    color: #777;
-  }
 }
 .item-list--reports__item--selected {
   background: $base_bg;
@@ -59,24 +30,6 @@
 }
 
 
-.item-list__item--empty {
-  background: none;
-  color: #777;
-  p {
-    padding: 1em;
-    text-align: center;
-  }
-}
-
-/* We have no padding on the front page */
-body.frontpage {
-    .item-list__item--with-pin a {
-        padding: 0;
-        padding-#{$left}: 3em;
-    }
-}
-
-
 .big-green-banner {
   display: none; // hide the empty banner by default
 }
-- 
cgit v1.2.3


From dd59d2831e7e824eb14051253fb59157e032673b Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Fri, 16 Dec 2016 15:32:22 +0000
Subject: Show shortlist icons in button on report page

---
 templates/web/base/report/_main.html               |   8 +++--
 web/cobrands/fixmystreet/fixmystreet.js            |  12 +++++--
 .../fixmystreet/images/icon-shortlist-mini.png     | Bin 0 -> 259 bytes
 .../fixmystreet/images/icon-shortlist-mini.svg     |   1 +
 .../fixmystreet/images/icon-shortlist-mini@2x.png  | Bin 0 -> 557 bytes
 .../fixmystreet/images/icon-shortlisted-mini.png   | Bin 0 -> 262 bytes
 .../fixmystreet/images/icon-shortlisted-mini.svg   |   1 +
 .../images/icon-shortlisted-mini@2x.png            | Bin 0 -> 478 bytes
 web/cobrands/sass/_base.scss                       |  36 +++++++++++++++++++--
 9 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-mini.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-mini.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlist-mini@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlisted-mini.png
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg
 create mode 100644 web/cobrands/fixmystreet/images/icon-shortlisted-mini@2x.png

diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index e232a575c..9431ef2ce 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -19,12 +19,16 @@
         data-label-add="[% loc('Add to shortlist') %]"
         data-value-remove="[% loc('Shortlisted') %]"
         data-value-add="[% loc('Shortlist') %]"
+        data-class-remove="btn--shortlisted"
+        data-class-add="btn--shortlist"
     [%~ IF c.user.is_planned_report(problem) ~%]
         value="[% loc('Shortlisted') %]"
         aria-label="[% loc('Remove from shortlist') %]"
+        class="btn--shortlisted"
     [%~ ELSE ~%]
         value="[% loc('Shortlist') %]"
         aria-label="[% loc('Add to shortlist') %]"
+        class="btn--shortlist"
     [%~ END ~%]
     ></p>
 </form>
@@ -127,9 +131,9 @@
       [% END %]
       [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %]
           [%~ IF c.user.is_planned_report(problem) ~%]
-            <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label>
+            <label class="btn btn--shortlisted" for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label>
           [%~ ELSE ~%]
-            <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label>
+            <label class="btn btn--shortlist" for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label>
           [%~ END ~%]
       [% END %]
     </div>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 1a69f895e..bec4bc295 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -328,13 +328,17 @@ $.extend(fixmystreet.set_up, {
             data = $form.serialize() + '&ajax=1',
             changeValue,
             buttonLabel,
-            buttonValue;
+            buttonValue,
+            classToAdd,
+            classToRemove;
 
         $.post(this.action, data, function(data) {
             if (data.outcome == 'add') {
                 $form.find("input[name='shortlist-add']" ).attr('name', 'shortlist-remove');
                 buttonLabel = $submit.data('label-remove');
                 buttonValue = $submit.data('value-remove');
+                classToAdd = $submit.data('class-remove');
+                classToRemove = $submit.data('class-add');
                 $('.shortlisted-status').remove();
                 $(document).trigger('shortlist-add', problemId);
             } else if (data.outcome == 'remove') {
@@ -342,9 +346,11 @@ $.extend(fixmystreet.set_up, {
                 buttonLabel = $submit.data('label-add');
                 buttonValue = $submit.data('value-add');
                 $(document).trigger('shortlist-remove', problemId);
+                classToAdd = $submit.data('class-add');
+                classToRemove = $submit.data('class-remove');
             }
-            $submit.val(buttonValue).attr('aria-label', buttonLabel);
-            $labels.text(buttonValue).attr('aria-label', buttonLabel);
+            $submit.val(buttonValue).attr('aria-label', buttonLabel).removeClass(classToRemove).addClass(classToAdd);
+            $labels.text(buttonValue).attr('aria-label', buttonLabel).removeClass(classToRemove).addClass(classToAdd);
         });
     });
   },
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-mini.png b/web/cobrands/fixmystreet/images/icon-shortlist-mini.png
new file mode 100644
index 000000000..730dd49df
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-mini.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg b/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg
new file mode 100644
index 000000000..98b89ab2e
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlist-mini.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>icon-shortlist</title><defs><path d="M3.4 15.22L8 12.804l4.6 2.418c.19-.126.377-.262.557-.405l-.88-5.12L16 6.067c-.062-.222-.133-.44-.212-.654l-5.144-.747-2.3-4.66C8.232.003 8.117 0 8 0c-.116 0-.23.002-.345.007l-2.3 4.66-5.143.746c-.08.214-.15.432-.212.654l3.722 3.628-.88 5.12c.18.143.367.28.56.406z" id="a"/><mask id="b" x="0" y="0" width="16" height="15.221" fill="#fff"><use xlink:href="#a"/></mask></defs><use mask="url(#b)" xlink:href="#a" stroke-width="2" stroke="#000" fill="none" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlist-mini@2x.png b/web/cobrands/fixmystreet/images/icon-shortlist-mini@2x.png
new file mode 100644
index 000000000..5a332f431
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlist-mini@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png
new file mode 100644
index 000000000..94cdd14fb
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.png differ
diff --git a/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg
new file mode 100644
index 000000000..1df25d7e7
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/icon-shortlisted-mini.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><title>icon-shortlisted</title><path d="M3.4 15.22L8 12.804l4.6 2.418c.19-.126.377-.262.557-.405l-.88-5.12L16 6.067c-.062-.222-.133-.44-.212-.654l-5.144-.747-2.3-4.66C8.232.003 8.117 0 8 0c-.116 0-.23.002-.345.007l-2.3 4.66-5.143.746c-.08.214-.15.432-.212.654l3.722 3.628-.88 5.12c.18.143.367.28.56.406z" fill="#00BD08" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/images/icon-shortlisted-mini@2x.png b/web/cobrands/fixmystreet/images/icon-shortlisted-mini@2x.png
new file mode 100644
index 000000000..8da64e9ec
Binary files /dev/null and b/web/cobrands/fixmystreet/images/icon-shortlisted-mini@2x.png differ
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 5d6176add..179168aae 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -767,7 +767,9 @@ input.final-submit {
 }
 
 .btn--navigate,
-.btn--geolocate {
+.btn--geolocate,
+.btn--shortlist,
+.btn--shortlisted {
     &:before {
         content: "";
         display: inline-block;
@@ -779,7 +781,7 @@ input.final-submit {
         vertical-align: -0.1em; // vertically centre icon in button
 
         @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-            background-image: url(/cobrands/fixmystreet/images/navigate@2.png);
+            background-image: url(/cobrands/fixmystreet/images/navigate@2x.png);
         }
 
         @media all {
@@ -793,7 +795,7 @@ input.final-submit {
         background-image: url(/cobrands/fixmystreet/images/crosshairs.png);
 
         @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-            background-image: url(/cobrands/fixmystreet/images/crosshairs@2.png);
+            background-image: url(/cobrands/fixmystreet/images/crosshairs@2x.png);
         }
 
         @media all {
@@ -802,6 +804,34 @@ input.final-submit {
     }
 }
 
+.btn--shortlist {
+    &:before {
+        background-image: url(/cobrands/fixmystreet/images/icon-shortlist-mini.png);
+
+        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+            background-image: url(/cobrands/fixmystreet/images/icon-shortlist-mini@2x.png);
+        }
+
+        @media all {
+            background-image: url(/cobrands/fixmystreet/images/icon-shortlist-mini.svg), none;
+        }
+    }
+}
+
+.btn--shortlisted {
+    &:before {
+        background-image: url(/cobrands/fixmystreet/images/icon-shortlisted-mini.png);
+
+        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+            background-image: url(/cobrands/fixmystreet/images/icon-shortlisted-mini@2x.png);
+        }
+
+        @media all {
+            background-image: url(/cobrands/fixmystreet/images/icon-shortlisted-mini.svg), none;
+        }
+    }
+}
+
 .btn--block {
     display: block;
     text-align: center;
-- 
cgit v1.2.3


From 831f0addbac7eb3e6641877c936f90279d1bb186 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 12 Jan 2017 15:24:16 +0000
Subject: Make sure csrf_time is deleted after use.

If an out-of-date token was passed to check_csrf_token, then no new
token would be output on the error page because csrf_time was still
present.
---
 perllib/FixMyStreet/App/Controller/Auth.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index c448f8749..6e8057723 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -516,11 +516,12 @@ sub check_csrf_token : Private {
     $token =~ s/ /+/g;
     my ($time) = $token =~ /^(\d+)-[0-9a-zA-Z+\/]+$/;
     $c->stash->{csrf_time} = $time;
+    my $gen_token = $c->forward('get_csrf_token');
+    delete $c->stash->{csrf_time};
     $c->detach('no_csrf_token')
         unless $time
             && $time > time() - 3600
-            && $token eq $c->forward('get_csrf_token');
-    delete $c->stash->{csrf_time};
+            && $token eq $gen_token;
 }
 
 sub no_csrf_token : Private {
-- 
cgit v1.2.3


From 4d872d6f1c6f840f172b49dc02464a67eece8e7a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 16 Jan 2017 11:03:39 +0000
Subject: =?UTF-8?q?[Harrogate]=20Don=E2=80=99t=20link=20to=20closed=20cobr?=
 =?UTF-8?q?and=20from=20all=20reports=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/web/fixmystreet.com/reports/_extras.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html
index 6fa067d1c..824fec3ec 100755
--- a/templates/web/fixmystreet.com/reports/_extras.html
+++ b/templates/web/fixmystreet.com/reports/_extras.html
@@ -4,7 +4,6 @@
         'Bromley Council' = 'fix.bromley.gov.uk'
         'Bristol City Council' = 'fixmystreet.bristol.gov.uk'
         'East Hertfordshire District Council' = 'fixmystreet.eastherts.gov.uk'
-        'Harrogate Borough Council' = 'harrogate.fixmystreet.com'
         'Hart District Council' = 'hart.fixmystreet.com'
         'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk'
         'Stevenage Borough Council' = 'stevenage.fixmystreet.com',
-- 
cgit v1.2.3


From e1bd00f5416cdea50919f645d649e3ef2cd14dae Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 16 Jan 2017 15:53:09 +0000
Subject: Add 0048 migration check to update-schema

---
 bin/update-schema | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/update-schema b/bin/update-schema
index 479a55c8e..b85ff87f4 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -194,6 +194,7 @@ else {
 # By querying the database schema, we can see where we're currently at
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
+    return '0048' if column_exists('response_templates', 'state');
     return '0047' if column_exists('response_priorities', 'description');
     return '0046' if column_exists('users', 'extra');
     return '0045' if table_exists('response_priorities');
-- 
cgit v1.2.3


From f53446b021827a298583d589e15bdb87a1b00328 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 11 Jan 2017 11:19:37 +0000
Subject: Add permision to view contributor details

---
 perllib/FixMyStreet/Cobrand/Default.pm    | 1 +
 perllib/FixMyStreet/Cobrand/UKCouncils.pm | 1 +
 t/app/controller/admin.t                  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 61982c47a..aad91429a 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -713,6 +713,7 @@ sub available_permissions {
             planned_reports => _("Manage shortlist"),
             contribute_as_another_user => _("Create reports/updates on a user's behalf"),
             contribute_as_body => _("Create reports/updates as the council"),
+            view_body_contribute_details => _("See user detail for reports created as the council"),
 
             # NB this permission is special in that it can be assigned to users
             # without their from_body being set. It's included here for
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 64ca7fc62..4e900e653 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -200,6 +200,7 @@ sub available_permissions {
 
     my $perms = $self->next::method();
     $perms->{Problems}->{contribute_as_body} = "Create reports/updates as " . $self->council_name;
+    $perms->{Problems}->{view_body_contribute_details} = "See user detail for reports created as " . $self->council_name;
     $perms->{Users}->{user_assign_areas} = "Assign users to areas in " . $self->council_name;
 
     return $perms;
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 1ab0cb488..ab6cac842 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -1190,6 +1190,7 @@ my %default_perms = (
     "permissions[report_instruct]" => undef,
     "permissions[contribute_as_another_user]" => undef,
     "permissions[contribute_as_body]" => undef,
+    "permissions[view_body_contribute_details]" => undef,
     "permissions[user_edit]" => undef,
     "permissions[user_manage_permissions]" => undef,
     "permissions[user_assign_body]" => undef,
-- 
cgit v1.2.3


From e81d5b686a44e7a07db276cccc718c4e28a28a1c Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 11 Jan 2017 14:17:34 +0000
Subject: Show user details for users with correct permissions

---
 perllib/FixMyStreet/DB/Result/Problem.pm | 16 ++++++---
 t/app/controller/report_as_other.t       |  1 -
 t/app/controller/report_display.t        | 57 ++++++++++++++++++++++++++++++--
 3 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 203e72fae..92c5c160a 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -606,20 +606,28 @@ sub meta_line {
             $meta = sprintf( _('Reported anonymously at %s'), $date_time );
         }
     } 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
+            $problem->name ne $problem->user->name) {
+            $problem_name = sprintf( _('%s (%s)'), $problem->name, $problem->user->name );
+        }
+
         if ( $problem->service and $category && $category ne _('Other') ) {
             $meta = sprintf(
                 _('Reported via %s in the %s category by %s at %s'),
                 $problem->service, $category,
-                $problem->name,    $date_time
+                $problem_name,    $date_time
             );
         } elsif ( $problem->service ) {
             $meta = sprintf( _('Reported via %s by %s at %s'),
-                $problem->service, $problem->name, $date_time );
+                $problem->service, $problem_name, $date_time );
         } elsif ( $category and $category ne _('Other') ) {
             $meta = sprintf( _('Reported in the %s category by %s at %s'),
-                $category, $problem->name, $date_time );
+                $category, $problem_name, $date_time );
         } else {
-            $meta = sprintf( _('Reported by %s at %s'), $problem->name, $date_time );
+            $meta = sprintf( _('Reported by %s at %s'), $problem_name, $date_time );
         }
     }
 
diff --git a/t/app/controller/report_as_other.t b/t/app/controller/report_as_other.t
index 505a1bf6b..b4405be57 100644
--- a/t/app/controller/report_as_other.t
+++ b/t/app/controller/report_as_other.t
@@ -191,4 +191,3 @@ sub dropdown_shown {
     my ($shown, $name) = @_;
     is grep({ $_ eq 'form_as' } keys %{$mech->visible_form_values($name)}), $shown, "Dropdown shown = $shown";
 }
-
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index fad8b2bbb..b35a4a026 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -210,13 +210,13 @@ foreach my $meta (
     $report->update;
     subtest "test correct problem meta information" => sub {
         $mech->get_ok("/report/$report_id");
-    
+
     is $mech->extract_problem_meta, $meta->{meta};
 
     };
 }
 
-for my $test ( 
+for my $test (
     {
         description => 'new report',
         date => DateTime->now,
@@ -385,7 +385,7 @@ for my $test (
 my $body_westminster = $mech->create_body_ok(2504, 'Westminster City Council');
 my $body_camden = $mech->create_body_ok(2505, 'Camden Borough Council');
 
-for my $test ( 
+for my $test (
     {
         desc => 'no state dropdown if user not from authority',
         from_body => undef,
@@ -530,6 +530,57 @@ subtest "Zurich banners are displayed correctly" => sub {
   };
 };
 
+my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council', id => 2237);
+my $oxfordshireuser = $mech->create_user_ok('counciluser@example.com', name => 'Council User', from_body => $oxfordshire);
+
+subtest "check user details show when a user has correct permissions" => sub {
+    $report->update( {
+      name => 'Oxfordshire County Council',
+      user_id => $oxfordshireuser->id,
+      service => '',
+      anonymous => 'f',
+      bodies_str => $oxfordshire->id,
+      confirmed => '2012-01-10 15:17:00'
+    });
+
+    ok $oxfordshireuser->user_body_permissions->create({
+        body => $oxfordshire,
+        permission_type => 'view_body_contribute_details',
+    });
+
+    $mech->log_in_ok( $oxfordshireuser->email );
+    ok $mech->get("/report/$report_id"), "get '/report/$report_id'";
+    is $mech->extract_problem_meta,
+      'Reported in the Roads category by Oxfordshire County Council (Council User) at 15:17, Tue 10 January 2012',
+      'correct problem meta information';
+
+    ok $oxfordshireuser->user_body_permissions->delete_all, "Remove view_body_contribute_details permissions";
+
+    ok $mech->get("/report/$report_id"), "get '/report/$report_id'";
+    is $mech->extract_problem_meta,
+      'Reported in the Roads category by Oxfordshire County Council at 15:17, Tue 10 January 2012',
+      'correct problem meta information for user without relevant permissions';
+
+    $mech->log_out_ok;
+
+    ok $mech->get("/report/$report_id"), "get '/report/$report_id'";
+    is $mech->extract_problem_meta,
+      'Reported in the Roads category by Oxfordshire County Council at 15:17, Tue 10 January 2012',
+      'correct problem meta information for logged out user';
+
+};
+
+subtest "check brackets don't appear when username and report name are the same" => sub {
+    $report->update( {
+      name => 'Council User'
+    });
+
+    $mech->log_in_ok( $oxfordshireuser->email );
+    ok $mech->get("/report/$report_id"), "get '/report/$report_id'";
+    is $mech->extract_problem_meta,
+      'Reported in the Roads category by Council User at 15:17, Tue 10 January 2012',
+      'correct problem meta information';
+};
 
 END {
     $mech->delete_user('test@example.com');
-- 
cgit v1.2.3


From b2dc16e1d7dfe160e286496d498cbfe46a076dfe Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Fri, 13 Jan 2017 11:14:03 +0000
Subject: Refactor updates metadata output into model

---
 perllib/FixMyStreet/DB/Result/Comment.pm | 84 +++++++++++++++++++++++++++++++-
 templates/web/base/report/updates.html   | 50 +------------------
 2 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index f5601639a..75d9deb25 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -6,6 +6,7 @@ package FixMyStreet::DB::Result::Comment;
 
 use strict;
 use warnings;
+use FixMyStreet::Template;
 
 use base 'DBIx::Class::Core';
 __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
@@ -199,7 +200,7 @@ __PACKAGE__->has_many(
   "admin_log_entries",
   "FixMyStreet::DB::Result::AdminLog",
   { "foreign.object_id" => "self.id" },
-  { 
+  {
       cascade_copy => 0, cascade_delete => 0,
       where => { 'object_type' => 'update' },
   }
@@ -223,4 +224,85 @@ __PACKAGE__->might_have(
   { cascade_copy => 0, cascade_delete => 1 },
 );
 
+=head2 meta_line
+
+Returns a string to be used on a report update, describing some of the metadata
+about an update
+
+=cut
+
+sub meta_line {
+    my ( $self, $c ) = @_;
+
+    my $meta = '';
+
+    $c->stash->{last_state} ||= '';
+
+    if ($self->anonymous or !$self->name) {
+        $meta = sprintf( _( 'Posted anonymously at %s' ), Utils::prettify_dt( $self->confirmed ) )
+    } elsif ($self->user->from_body) {
+        my $user_name = FixMyStreet::Template::html_filter($self->user->name);
+        my $body = $self->user->body;
+        if ($body eq 'Bromley Council') {
+            $body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>";
+        }
+        $meta = sprintf( _( 'Posted by %s (<strong>%s</strong>) at %s' ), $user_name, $body, Utils::prettify_dt( $self->confirmed ) );
+    } else {
+        $meta = sprintf( _( 'Posted by %s at %s' ), FixMyStreet::Template::html_filter($self->name), Utils::prettify_dt( $self->confirmed ) )
+    }
+
+    my $update_state = '';
+
+    if ($self->mark_fixed) {
+        $update_state = _( 'marked as fixed' );
+    } elsif ($self->mark_open)  {
+        $update_state = _( 'reopened' );
+    } elsif ($self->problem_state) {
+        my $state = $self->problem_state_display;
+
+        if ($state eq 'confirmed') {
+            if ($c->stash->{last_state}) {
+                $update_state = _( 'reopened' )
+            }
+        } elsif ($state eq 'investigating') {
+            $update_state = _( 'marked as investigating' )
+        } elsif ($state eq 'planned') {
+            $update_state = _( 'marked as planned' )
+        } elsif ($state eq 'in progress') {
+            $update_state = _( 'marked as in progress' )
+        } elsif ($state eq 'action scheduled') {
+            $update_state = _( 'marked as action scheduled' )
+        } elsif ($state eq 'closed') {
+            $update_state = _( 'marked as closed' )
+        } elsif ($state eq 'fixed') {
+            $update_state = _( 'marked as fixed' )
+        } elsif ($state eq 'unable to fix') {
+            $update_state = _( 'marked as unable to fix' )
+        } elsif ($state eq 'not responsible') {
+            $update_state = _( "marked as not the council's responsibility" )
+        } elsif ($state eq 'duplicate') {
+            $update_state = _( 'closed as a duplicate report' )
+        } elsif ($state eq 'internal referral') {
+            $update_state = _( 'marked as an internal referral' )
+        }
+
+        if ($c->cobrand->moniker eq 'bromley' || $self->problem->bodies_str eq '2482') {
+            if ($state eq 'unable to fix') {
+                $update_state = 'marked as no further action';
+            } elsif ($state eq 'not responsible') {
+                $update_state = 'marked as third party responsibility'
+            }
+        }
+
+    }
+
+    if ($update_state ne $c->stash->{last_state} and $update_state) {
+        $meta .= ", $update_state";
+    }
+
+    $c->stash->{last_state} = $update_state;
+
+    return $meta;
+};
+
 1;
diff --git a/templates/web/base/report/updates.html b/templates/web/base/report/updates.html
index ff48ecbca..75e94b1d5 100644
--- a/templates/web/base/report/updates.html
+++ b/templates/web/base/report/updates.html
@@ -11,54 +11,6 @@
         [% RETURN %]
     [% END %]
 
-    [% IF update.anonymous || update.name == '' %]
-        [% tprintf( loc( 'Posted anonymously at %s' ), prettify_dt( update.confirmed ) ) -%]
-    [%- ELSIF update.user.from_body;
-        user_name = update.user.name | html;
-        body = update.user.body;
-        IF body == 'Bromley Council';
-            body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>";
-        END %]
-        [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_dt( update.confirmed ) ) -%]
-    [%- ELSE %]
-        [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%]
-    [%- END -%]
+    [% update.meta_line(c) %]
 
-    [%- update_state = '' %]
-    [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %]
-    [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %]
-    [%- IF !update_state && update.problem_state %]
-        [%- state = update.problem_state_display %]
-        [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %]
-            [%- SET update_state = 'marked as no further action' IF state == 'unable to fix' %]
-            [%- SET update_state = 'marked as third party responsibility' IF state == 'not responsible' %]
-        [%- END %]
-    [%- END %]
-    [%- IF !update_state && update.problem_state %]
-        [%- IF state == 'confirmed' AND global.last_state != '' %]
-            [%- update_state = loc( 'reopened' ) %]
-        [%- ELSIF state == 'investigating' %]
-            [%- update_state = loc( 'marked as investigating' ) %]
-        [%- ELSIF state == 'planned' %]
-            [%- update_state = loc( 'marked as planned' ) %]
-        [%- ELSIF state == 'in progress' %]
-            [%- update_state = loc( 'marked as in progress' ) %]
-        [%- ELSIF state == 'action scheduled' %]
-            [%- update_state = loc( 'marked as action scheduled' ) %]
-        [%- ELSIF state == 'closed' %]
-            [%- update_state = loc( 'marked as closed' ) %]
-        [%- ELSIF state == 'fixed' %]
-            [%- update_state = loc( 'marked as fixed' ) %]
-        [%- ELSIF state == 'unable to fix' %]
-            [%- update_state = loc( 'marked as unable to fix' ) %]
-        [%- ELSIF state == 'not responsible' %]
-            [%- update_state = loc( "marked as not the council's responsibility" ) %]
-        [%- ELSIF state == 'duplicate' %]
-            [%- update_state = loc( 'closed as a duplicate report' ) %]
-        [%- ELSIF state == 'internal referral' %]
-            [%- update_state = loc( 'marked as an internal referral' ) %]
-        [%- END %]
-    [%- END %]
-    [%- ", " _ update_state IF update_state != global.last_state %]
-    [%- global.last_state = update_state %]
 [% END %]
-- 
cgit v1.2.3


From cd59528437a333523b8c3a06817da6da8ff315d3 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Fri, 13 Jan 2017 14:01:22 +0000
Subject: Allow users with permission to see update username

---
 perllib/FixMyStreet/DB/Result/Comment.pm |  6 +++++-
 t/app/controller/report_updates.t        | 30 ++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 75d9deb25..fb41bc7f0 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -246,7 +246,11 @@ sub meta_line {
         if ($body eq 'Bromley Council') {
             $body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>";
         }
-        $meta = sprintf( _( 'Posted by %s (<strong>%s</strong>) at %s' ), $user_name, $body, Utils::prettify_dt( $self->confirmed ) );
+        if ($c->user_exists and $c->user->has_permission_to('view_body_contribute_details', $self->problem->bodies_str_ids)) {
+            $meta = sprintf( _( 'Posted by <strong>%s</strong> (%s) at %s' ), $body, $user_name, Utils::prettify_dt( $self->confirmed ) );
+        } else {
+            $meta = sprintf( _( 'Posted by <strong>%s</strong> at %s' ), $body, Utils::prettify_dt( $self->confirmed ) );
+        }
     } else {
         $meta = sprintf( _( 'Posted by %s at %s' ), FixMyStreet::Template::html_filter($self->name), Utils::prettify_dt( $self->confirmed ) )
     }
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index f7544f0a1..6fc7bb8e1 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -653,6 +653,18 @@ for my $test (
         state => 'fixed - council',
         report_bodies => $body->id . ',2505',
     },
+    {
+      desc => 'from authority user show username for users with correct permissions',
+      fields => {
+          name => $user->name,
+          may_show_name => 1,
+          update => 'Set state to fixed',
+          state => 'fixed',
+      },
+      state => 'fixed - council',
+      report_bodies => $body->id . ',2505',
+      view_username => 1
+    },
 ) {
     subtest $test->{desc} => sub {
         $report->comments->delete;
@@ -662,6 +674,14 @@ for my $test (
         }
 
         $mech->log_in_ok( $user->email );
+
+        if ($test->{view_username}) {
+          ok $user->user_body_permissions->create({
+            body => $body,
+            permission_type => 'view_body_contribute_details'
+          }), 'Give user view_body_contribute_details permissions';
+        }
+
         $user->from_body( $body->id );
         $user->update;
 
@@ -690,8 +710,14 @@ for my $test (
         } else {
             like $update_meta->[0], qr/marked as $meta_state$/, 'update meta includes state change';
         }
-        like $update_meta->[0], qr{Test User \(Westminster City Council\)}, 'update meta includes council name';
-        $mech->content_contains( 'Test User (<strong>Westminster City Council</strong>)', 'council name in bold');
+
+        if ($test->{view_username}) {
+          like $update_meta->[0], qr{Westminster City Council \(Test User\)}, 'update meta includes council and user name';
+          $user->user_body_permissions->delete_all;
+        } else {
+          like $update_meta->[0], qr{Westminster City Council}, 'update meta includes council name';
+          $mech->content_contains( '<strong>Westminster City Council</strong>', 'council name in bold');
+        }
 
         $report->discard_changes;
         is $report->state, $test->{state}, 'state set';
-- 
cgit v1.2.3


From f41b1719cc8f807912696a6728b20c0a2252e5a9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 17 Jan 2017 15:52:38 +0000
Subject: In Edge 14, do all HTTP redirects in HTML instead.

This is to work around
https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8572187/
---
 perllib/FixMyStreet/App.pm          |  3 +++
 perllib/FixMyStreet/App/Response.pm | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 perllib/FixMyStreet/App/Response.pm

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 7809b5f12..7c5ef488b 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -4,6 +4,7 @@ use namespace::autoclean;
 
 use Catalyst::Runtime 5.80;
 use FixMyStreet;
+use FixMyStreet::App::Response;
 use FixMyStreet::Cobrand;
 use Memcached;
 use FixMyStreet::Map;
@@ -82,6 +83,8 @@ __PACKAGE__->config(
     },
 );
 
+__PACKAGE__->response_class('FixMyStreet::App::Response');
+
 # Start the application
 __PACKAGE__->setup();
 
diff --git a/perllib/FixMyStreet/App/Response.pm b/perllib/FixMyStreet/App/Response.pm
new file mode 100644
index 000000000..16ebf995f
--- /dev/null
+++ b/perllib/FixMyStreet/App/Response.pm
@@ -0,0 +1,27 @@
+# This package exists to try and work around a big bug in Edge:
+# https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8572187/
+
+package FixMyStreet::App::Response;
+use Moose;
+extends 'Catalyst::Response';
+
+around 'redirect' => sub {
+    my $orig = shift;
+    my $self = shift;
+    my ($location, $status) = @_;
+
+    return $self->$orig() unless @_;  # getter
+
+    my $agent = $self->_context->request->user_agent;
+    return $self->$orig(@_) unless $agent =~ /Edge\/14/;  # Only care about Edge
+
+    # Instead of a redirect, output HTML that redirects
+    $self->body(<<END
+<meta http-equiv="refresh" content="0; url=$location">
+Please follow this link: <a href="$location">$location</a>
+END
+    );
+    return $location;
+};
+
+1;
-- 
cgit v1.2.3


From fa669c507539cddbc913e7cff7fe8758236bd6cd Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 19 Jan 2017 11:56:38 +0000
Subject: Open311 warn only after a couple of failures.

There are a couple of servers we currently talk to that
error not that infrequently but work in the end.
---
 perllib/Open311.pm |  8 ++++----
 t/open311.t        | 37 +++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index 0b44575db..c1323acfa 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -83,10 +83,10 @@ sub send_service_request {
         }
 
         warn sprintf( "Failed to submit problem %s over Open311, response\n: %s\n%s", $problem->id, $response, $self->debug_details )
-            unless $problem->send_fail_count;
+            if $problem->send_fail_count && $problem->send_fail_count == 2;
     } else {
         warn sprintf( "Failed to submit problem %s over Open311, details:\n%s", $problem->id, $self->error)
-            unless $problem->send_fail_count;
+            if $problem->send_fail_count && $problem->send_fail_count == 2;
     }
     return 0;
 }
@@ -259,10 +259,10 @@ sub post_service_request_update {
         }
 
         warn sprintf( "Failed to submit comment %s over Open311, response - %s\n%s\n", $comment->id, $response, $self->debug_details )
-            unless $comment->send_fail_count;
+            if $comment->send_fail_count && $comment->send_fail_count == 2;
     } else {
         warn sprintf( "Failed to submit comment %s over Open311, details\n%s\n", $comment->id, $self->error)
-            unless $comment->send_fail_count;
+            if $comment->send_fail_count && $comment->send_fail_count == 2;
     }
     return 0;
 }
diff --git a/t/open311.t b/t/open311.t
index cbf305a36..e6ea9b6fc 100644
--- a/t/open311.t
+++ b/t/open311.t
@@ -30,20 +30,26 @@ my $o2 = Open311->new( endpoint => 'http://127.0.0.1/open311/', jurisdiction =>
 
 my $u = FixMyStreet::DB->resultset('User')->new( { email => 'test@example.org', name => 'A User' } );
 
-my $p = FixMyStreet::DB->resultset('Problem')->new( {
-    latitude => 1,
-    longitude => 1,
-    title => 'title',
-    detail => 'detail',
-    user => $u,
-    id => 1,
-    name => 'A User',
-    cobrand => 'fixmystreet',
-} );
-
-my $expected_error = qr{Failed to submit problem 1 over Open311}ism;
-
-warning_like {$o2->send_service_request( $p, { url => 'http://example.com/' }, 1 )} $expected_error, 'warning generated on failed call';
+for my $sfc (0..2) {
+    my $p = FixMyStreet::DB->resultset('Problem')->new( {
+        latitude => 1,
+        longitude => 1,
+        title => 'title',
+        detail => 'detail',
+        user => $u,
+        id => 1,
+        name => 'A User',
+        cobrand => 'fixmystreet',
+        send_fail_count => $sfc,
+    } );
+    my $expected_error = qr{Failed to submit problem 1 over Open311}ism;
+
+    if ($sfc == 2) {
+        warning_like {$o2->send_service_request( $p, { url => 'http://example.com/' }, 1 )} $expected_error, 'warning generated on failed call';
+    } else {
+        warning_like {$o2->send_service_request( $p, { url => 'http://example.com/' }, 1 )} undef, 'no warning generated on failed call';
+    }
+}
 
 my $dt = DateTime->now();
 
@@ -572,6 +578,9 @@ for my $test (
     };
 }
 
+$problem->send_fail_count(2);
+$comment->send_fail_count(2);
+
 subtest 'No request id in reponse' => sub {
     my $results;
     warning_like {
-- 
cgit v1.2.3


From a8afa603afcd3be86d9705e97b193983bbf6b34e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 18 Jan 2017 11:16:48 +0000
Subject: Redirect after user creation/edit

Solves a minor bug where it was difficult to create a new user and immediately
assign permissions, as the page didn't show the appropriate permissions UI.
---
 perllib/FixMyStreet/App/Controller/Admin.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index d8c5cdf6d..5d496e7e8 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1220,10 +1220,8 @@ sub user_add : Path('user_edit') : Args(0) {
 
     $c->forward( 'log_edit', [ $user->id, 'user', 'edit' ] );
 
-    $c->stash->{status_message} =
-      '<p><em>' . _('Updated!') . '</em></p>';
-
-    return 1;
+    $c->flash->{status_message} = _("Updated!");
+    $c->res->redirect( $c->uri_for( 'user_edit', $user->id ) );
 }
 
 sub user_edit : Path('user_edit') : Args(1) {
@@ -1247,6 +1245,11 @@ sub user_edit : Path('user_edit') : Args(1) {
     $c->forward('fetch_all_bodies');
     $c->forward('fetch_body_areas', [ $user->from_body ]) if $user->from_body;
 
+    if ( defined $c->flash->{status_message} ) {
+        $c->stash->{status_message} =
+            '<p><em>' . $c->flash->{status_message} . '</em></p>';
+    }
+
     if ( $c->get_param('submit') ) {
         $c->forward('/auth/check_csrf_token');
 
@@ -1370,10 +1373,9 @@ sub user_edit : Path('user_edit') : Args(1) {
             if ($edited) {
                 $c->forward( 'log_edit', [ $id, 'user', 'edit' ] );
             }
+            $c->flash->{status_message} = _("Updated!");
+            $c->res->redirect( $c->uri_for( 'user_edit', $user->id ) );
         }
-
-        $c->stash->{status_message} =
-          '<p><em>' . _('Updated!') . '</em></p>';
     }
 
     if ( $user->from_body ) {
-- 
cgit v1.2.3


From 1ed0503cc5bf43a5697e732cdc4581445e54d214 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 18 Jan 2017 11:26:37 +0000
Subject: =?UTF-8?q?Include=20=E2=80=98Add=20user=E2=80=99=20link=20on=20ad?=
 =?UTF-8?q?min=20user=20search=20results=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/web/base/admin/users.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html
index 47901aed8..8e35e1c31 100644
--- a/templates/web/base/admin/users.html
+++ b/templates/web/base/admin/users.html
@@ -47,6 +47,8 @@
 [% IF NOT searched %]
 <h2>[% loc('Add user') %]</h2>
 [% INCLUDE 'admin/user-form.html', user = '' %]
+[% ELSE %]
+<a href="[% c.uri_for( c.controller('Admin').action_for('user_add') ) %]">[% loc('Add user') %]</a>
 [% END %]
 
 [% INCLUDE 'admin/footer.html' %]
-- 
cgit v1.2.3


From be3b9b2cb124f7381eba00ae1d701a50beccb056 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 19 Jan 2017 15:18:31 +0000
Subject: [Greenwich] Show 20 reports per page instead of 100

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

diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 7777079a9..f51315401 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -55,4 +55,6 @@ sub contact_email {
     return join( '@', 'fixmystreet', 'royalgreenwich.gov.uk' );
 }
 
+sub reports_per_page { return 20; }
+
 1;
-- 
cgit v1.2.3


From 24fcbfb3705060845d16b6fbe4c3da1e5e12eea2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Sat, 21 Jan 2017 11:54:16 +0000
Subject: No need to translate this string at present.

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

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 92c5c160a..e42e7110a 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -611,7 +611,7 @@ sub meta_line {
         if ($c->user_exists and
             $c->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 );
+            $problem_name = sprintf('%s (%s)', $problem->name, $problem->user->name );
         }
 
         if ( $problem->service and $category && $category ne _('Other') ) {
-- 
cgit v1.2.3


From 5277688f17d1f0a26ae186779bb9aa4e8c7dd391 Mon Sep 17 00:00:00 2001
From: mccheung <mc_cheung@126.com>
Date: Sat, 21 Jan 2017 11:40:38 +0800
Subject: Mark two missing strings for translation.

Fixes #1604.
---
 templates/web/base/report/new/form_report.html | 2 +-
 templates/web/base/report/new/form_user.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index 3c36bd0cc..e85d890c9 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -7,7 +7,7 @@
 [% PROCESS "report/new/category_wrapper.html" %]
 [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
 
-    <h2 class="form-section-heading">Public details</h2>
+    <h2 class="form-section-heading">[% loc( 'Public details' ) %]</h2>
     <div class="form-section-description" id="js-councils_text">
       [% IF js %]
         [% PROCESS 'report/new/councils_text_all.html' list_of_names = [ loc('the local council') ] %]
diff --git a/templates/web/base/report/new/form_user.html b/templates/web/base/report/new/form_user.html
index 424660aa8..68a226693 100644
--- a/templates/web/base/report/new/form_user.html
+++ b/templates/web/base/report/new/form_user.html
@@ -1,4 +1,4 @@
-<h2 class="form-section-heading form-section-heading--private">Private details</h2>
+<h2 class="form-section-heading form-section-heading--private">[% loc('Private details') %]</h2>
 <p class="form-section-description" id="js-councils_text_private">
   [% IF js %]
     [% loc('These will be sent to the council, but will never be shown online.') %]
-- 
cgit v1.2.3


From fd55ac237e453139f4e8feba5db2fe6e55987023 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 24 Jan 2017 09:20:35 +0000
Subject: Redirect to shortlist if user has shortlist perms.

Assume that if they inspect and save a report, they want
to go back to their shortlist.
---
 perllib/FixMyStreet/App/Controller/Report.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 3c251a5cb..175db4a19 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -433,6 +433,12 @@ sub inspect : Private {
             } else {
                 $redirect_uri = $c->uri_for( $problem->url );
             }
+
+            # Or if inspector, redirect back to shortlist
+            if ($c->user->has_body_permission_to('planned_reports')) {
+                $redirect_uri = $c->uri_for_action('my/planned');
+            }
+
             $c->log->debug( "Redirecting to: " . $redirect_uri );
             $c->res->redirect( $redirect_uri );
         }
-- 
cgit v1.2.3


From 3c10672a588f07eb87fb1c65cb195215487ec19b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 24 Jan 2017 09:58:01 +0000
Subject: Fire shortlist JavaScript only on report lists.

It was also catching update lists, which have their own submit buttons
(e.g. for moderation).
---
 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 bec4bc295..313d790c9 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -497,7 +497,7 @@ $.extend(fixmystreet.set_up, {
         btn.attr('name', 'shortlist-' + sw);
     }
 
-    $('.item-list').on('click', ':submit', function(e) {
+    $('.item-list--reports').on('click', ':submit', function(e) {
       e.preventDefault();
 
       var $submitButton = $(this);
-- 
cgit v1.2.3


From 047044ee8e1c9c8e79182c3a61808bbaa7ccfc9c Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 17 Jan 2017 17:45:50 +0000
Subject: Lowercase email when signing in.

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

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 6e8057723..825033f21 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -70,6 +70,7 @@ sub sign_in : Private {
     my ( $self, $c, $email ) = @_;
 
     $email ||= $c->get_param('email') || '';
+    $email = lc $email;
     my $password = $c->get_param('password_sign_in') || '';
     my $remember_me = $c->get_param('remember_me') || 0;
 
-- 
cgit v1.2.3


From 71c3c54ecf260024cfa468a077b17ced5f34a5dd Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 27 Jan 2017 15:29:44 +0000
Subject: [Greenwich] Show reports up to 3 months old by default

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

diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index f51315401..62b0e1fc8 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -57,4 +57,8 @@ sub contact_email {
 
 sub reports_per_page { return 20; }
 
+sub on_map_default_max_pin_age {
+    return '3 month';
+}
+
 1;
-- 
cgit v1.2.3


From 111acf7ccb452a7c163682b73b9cf5aee5f98be1 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 30 Jan 2017 14:54:50 +0000
Subject: Return JSON if `ajax` in params

---
 perllib/FixMyStreet/App/Controller/My.pm |  4 ++++
 t/app/controller/my_planned.t            | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index c26cdd5c8..ffcdf829d 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -56,6 +56,10 @@ sub planned : Local : Args(0) {
     $c->forward('planned_reorder');
     $c->forward('/reports/stash_report_sort', [ 'shortlist' ]);
     $c->forward('get_problems');
+    if ($c->get_param('ajax')) {
+        $c->stash->{shortlist} = $c->stash->{sort_key} eq 'shortlist';
+        $c->detach('/reports/ajax', [ 'my/_problem-list.html' ]);
+    }
     $c->forward('setup_page_data');
 }
 
diff --git a/t/app/controller/my_planned.t b/t/app/controller/my_planned.t
index d66673589..fa463e61e 100644
--- a/t/app/controller/my_planned.t
+++ b/t/app/controller/my_planned.t
@@ -45,6 +45,18 @@ $mech->content_contains('Shortlist');
 $mech->submit_form_ok({ with_fields => { 'shortlist-add' => 1 } });
 $mech->content_contains('Shortlisted');
 
+$mech->get_ok('/my/planned?sort=shortlist&ajax=1');
+$mech->content_contains('shortlist-up');
+$mech->content_contains('shortlist-down');
+
+$mech->get_ok('/my/planned?sort=created-desc&ajax=1');
+$mech->content_lacks('shortlist-up');
+$mech->content_lacks('shortlist-down');
+
+$mech->get_ok('/my/planned?ajax=1');
+$mech->content_contains('shortlist-up');
+$mech->content_contains('shortlist-down');
+
 done_testing();
 
 END {
-- 
cgit v1.2.3


From 1328677512a870561c84ba57b9ac0dace993dc13 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Mon, 30 Jan 2017 14:55:06 +0000
Subject: Wrap problem list in `js-reports-list`

---
 templates/web/base/my/planned.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/web/base/my/planned.html b/templates/web/base/my/planned.html
index d1a6b7b1b..366a554d9 100644
--- a/templates/web/base/my/planned.html
+++ b/templates/web/base/my/planned.html
@@ -26,7 +26,9 @@
 <div class="js-pagination">
 [% INCLUDE 'pagination.html', pager = problems_pager, param = 'p' %]
 </div>
+<div id="js-reports-list">
 [% INCLUDE 'my/_problem-list.html' shortlist = 1 %]
+</div>
 </section>
 
         </div>
-- 
cgit v1.2.3


From 64e43ba8d5d4223cdd0eb29bea289201a490a4de Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 27 Jan 2017 11:55:43 +0000
Subject: Simplify response template selector HTML

Using a div inside a p isn't valid, so the DOM was being restructured by the
browser causing the 'save with public update' toggle on the inspect form to not
work.

This fixes the issue by removing the wrapper <div> and selecting the appropriate
elements for toggling with the js- class on the <select>.

Fixes mysociety/fixmystreetforcouncils#153
---
 templates/web/base/admin/response_templates_select.html | 2 --
 web/cobrands/zurich/js.js                               | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/web/base/admin/response_templates_select.html b/templates/web/base/admin/response_templates_select.html
index e10460e48..ec50b2401 100644
--- a/templates/web/base/admin/response_templates_select.html
+++ b/templates/web/base/admin/response_templates_select.html
@@ -1,10 +1,8 @@
 [% IF problem.response_templates %]
-<div class="response_templates_select">
     <select id="templates_for_[% for %]" class="form-control js-template-name" data-for="[% for %]" name="response_template">
         <option value="">[% loc('--Choose a template--') %]</option>
       [% FOR t IN problem.response_templates %]
         <option value="[% t.text | html %]" data-problem-state="[% t.state | html %]"> [% t.title | html %] </option>
       [% END %]
     </select>
-</div>
 [% END %]
diff --git a/web/cobrands/zurich/js.js b/web/cobrands/zurich/js.js
index f3977161c..d2909bb6d 100644
--- a/web/cobrands/zurich/js.js
+++ b/web/cobrands/zurich/js.js
@@ -70,7 +70,7 @@ $(function() {
         // same or different state to the one we started on
         if (state === $(this).data('pstate')) {
             $('input[name=publish_response]').show();
-            $('.response_templates_select').show();
+            $('.js-template-name').show();
             $('#status_update_container').show();
 
             if (state === 'confirmed') {
@@ -85,7 +85,7 @@ $(function() {
         }
         else {
             $('input[name=publish_response]').hide();
-            $('.response_templates_select').hide();
+            $('.js-template-name').hide();
             $('#status_update_container').hide();
 
             $('#assignation__category').hide();
-- 
cgit v1.2.3


From 40076e8ea07de1d68dbfa1b33b48500a3c031634 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 1 Feb 2017 15:00:03 +0000
Subject: =?UTF-8?q?Show=20=E2=80=98unable=20to=20fix=E2=80=99=20state=20as?=
 =?UTF-8?q?=20=E2=80=98no=20further=20action=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bromley had this already in its update state change messages.
---
 perllib/FixMyStreet/DB/Result/Comment.pm          | 6 ++----
 t/app/controller/report_updates.t                 | 2 +-
 templates/web/base/admin/report_blocks.html       | 2 +-
 templates/web/base/report/update/form_update.html | 2 +-
 templates/web/bromley/report/update-form.html     | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index fb41bc7f0..a15400cc1 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -281,7 +281,7 @@ sub meta_line {
         } elsif ($state eq 'fixed') {
             $update_state = _( 'marked as fixed' )
         } elsif ($state eq 'unable to fix') {
-            $update_state = _( 'marked as unable to fix' )
+            $update_state = _( 'marked as no further action' )
         } elsif ($state eq 'not responsible') {
             $update_state = _( "marked as not the council's responsibility" )
         } elsif ($state eq 'duplicate') {
@@ -291,9 +291,7 @@ sub meta_line {
         }
 
         if ($c->cobrand->moniker eq 'bromley' || $self->problem->bodies_str eq '2482') {
-            if ($state eq 'unable to fix') {
-                $update_state = 'marked as no further action';
-            } elsif ($state eq 'not responsible') {
+            if ($state eq 'not responsible') {
                 $update_state = 'marked as third party responsibility'
             }
         }
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 6fc7bb8e1..41d181e65 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -594,7 +594,7 @@ for my $test (
             name => $user->name,
             may_show_name => 1,
             update => 'Set state to unable to fix',
-            state => 'unable to fix',
+            state => 'no further action',
         },
         state => 'unable to fix',
     },
diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index 1dd4c9dd0..9231dd1c2 100644
--- a/templates/web/base/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
@@ -11,7 +11,7 @@ SET state_pretty = {
     'fixed' = loc('Fixed')
     'fixed - user' = loc('Fixed - User')
     'fixed - council' = loc('Fixed - Council')
-    'unable to fix' = loc('Unable to fix')
+    'unable to fix' = loc('No further action')
     'not responsible' = loc('Not Responsible')
     'duplicate' = loc('Duplicate')
     'closed' = loc('Closed')
diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index a3d4615e1..e0464eec3 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -41,7 +41,7 @@
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
     loc('Investigating')], ['action scheduled', loc('Action Scheduled')],
     ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')],
-    ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')],
+    ['unable to fix', loc('No further action')], ['not responsible', loc('Not Responsible')],
     ['fixed', loc('Fixed')] ] %]
         <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option>
     [% END %]
diff --git a/templates/web/bromley/report/update-form.html b/templates/web/bromley/report/update-form.html
index 112cb2960..99f8248e3 100644
--- a/templates/web/bromley/report/update-form.html
+++ b/templates/web/bromley/report/update-form.html
@@ -51,7 +51,7 @@
                     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
                     loc('Investigating')], ['action scheduled', loc('Action Scheduled')],
                     ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')],
-                    ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')],
+                    ['unable to fix', loc('No further action')], ['not responsible', loc('Not Responsible')],
                     ['fixed', loc('Fixed')] ] %]
                     <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option>
                 [% END %]
-- 
cgit v1.2.3


From 39bdb7dbd10683538d6eea9e43d286ac288148b2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Feb 2017 08:46:32 +0000
Subject: Make gettext-nget-patch be consistent in output.

---
 bin/gettext-nget-patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch
index 92b687552..d058bc784 100755
--- a/bin/gettext-nget-patch
+++ b/bin/gettext-nget-patch
@@ -30,7 +30,7 @@ find( sub {
     close FP;
 }, 'templates', 'perllib');
 
-foreach (values %out) {
+foreach (sort { $a->{s} cmp $b->{s} } values %out) {
     print <<EOF;
 
 #: $_->{file}:$_->{line}
-- 
cgit v1.2.3


From 63d4804973ae4bd26bf4af098f3ba57a14a0647f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Feb 2017 08:34:48 +0000
Subject: Update translations from Transifex.

---
 locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po    |  343 +-
 locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po |  229 +-
 locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po |  253 +-
 locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po    |  234 +-
 locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po |  265 +-
 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po |  156 +-
 locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po |  224 +-
 locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po |  287 +-
 locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po    |  264 +-
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 4515 +++++++++++++++++++++++++
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po |   63 +-
 locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po |   90 +-
 locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po    |  199 +-
 locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po    |  212 +-
 locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po |  232 +-
 locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po    |  219 +-
 locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po |  221 +-
 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po |   45 +-
 locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po |  292 +-
 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po |  173 +-
 locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po    |  224 +-
 locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po |   79 +-
 locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po    |  280 +-
 locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po    | 1007 +++---
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po |   29 +-
 locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po |  269 +-
 locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po |  229 +-
 locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po    |  277 +-
 28 files changed, 6679 insertions(+), 4231 deletions(-)
 create mode 100644 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po

diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1ba0dec51..620602b26 100644
--- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,20 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Abdullah Aldebas <demo@adebas.net>, 2015
-# AR C2 <e2f458fd4s512@outlook.com>, 2015
-# Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015-2016
-# Omar Duhaiby <3omarz@gmail.com>, 2015
-# Turki Alhajjaji <thugrh@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/mysociety/fixmystreet/language/ar/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2016\n"
+"Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -196,9 +191,8 @@ msgid "-- Pick a property type --"
 msgstr "-- إختر نوع العقار--"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "اختيار قالب"
+msgstr "-اختر قالب---"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -298,18 +292,16 @@ msgid "Add user"
 msgstr "إضافة مستخدم"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "أضف تصنيفاً"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
-msgstr ""
+msgstr "اضف/عدل أولويات الاستجابة"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
-#, fuzzy
 msgid "Add/edit response templates"
-msgstr "قوالب الاستجابة لـ %s"
+msgstr "اضف/عدل قوالب الاستجابة"
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -338,22 +330,20 @@ msgstr "نبهني بأحدث المستجدات"
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
-msgstr "كل التقرير"
+msgstr "كل التقارير"
 
 #: templates/web/zurich/admin/stats.html:5
 msgid "All Reports as CSV"
 msgstr "جميع التقارير بتنسيق CSV"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "كل التقرير"
+msgstr "كل التصنيفات"
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "كل التقارير"
@@ -379,9 +369,8 @@ msgstr "مجهول:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "إضافة مستخدم"
+msgstr "مستخدم اخر"
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -393,9 +382,8 @@ msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟"
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "هل انت مطور ؟"
+msgstr "هل أنت متأكد؟"
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -430,9 +418,8 @@ msgid "Assign to subdivision:"
 msgstr "تعيين إلى قسم فرعي:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "عين إلى %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -452,18 +439,17 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "الاستجابة العامة:"
+msgstr "الإستجابة الآلية:"
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
 msgid "Available categories"
-msgstr ""
+msgstr "التصنيفات المتاحة"
 
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
-msgstr ""
+msgstr "تفادى المعلومات الشخصية ولوحات السيارات"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:401
 #: templates/web/zurich/report/_item.html:9
@@ -475,9 +461,8 @@ msgid "Back"
 msgstr "الخلف"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "كل التقارير"
+msgstr "عد إلى كل التقارير"
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -517,18 +502,16 @@ msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخط
 
 #: templates/web/base/report/_inspect.html:141
 msgid "Cancel"
-msgstr ""
+msgstr "إلغاء"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "تصنيف"
+msgstr "تصنيفات"
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "تصنيف:"
+msgstr "تصنيفات:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -545,9 +528,8 @@ msgid "Category"
 msgstr "تصنيف"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "على سبيل المثال، ’%s‘ أو ’%s‘"
+msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’"
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -568,14 +550,13 @@ msgstr "تصنيف: %s"
 
 #: templates/web/base/my/my.html:24
 msgid "Change email"
-msgstr ""
+msgstr "تغيير البريد الإلكتروني"
 
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "حظر البريد الإلكتروني"
+msgstr "تغيير عنوان البريد الإلكتروني"
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -806,14 +787,12 @@ msgid "Create category"
 msgstr "انشء تصنيف"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "انشئ بلاغ"
+msgstr "انشء أولوية"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "لم يتم إبلاغ المجلس"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -881,9 +860,8 @@ msgid "Description"
 msgstr "الوصف"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "الوصف"
+msgstr "الوصف:"
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -973,28 +951,24 @@ msgid "Edit body details"
 msgstr "تعديل تفاصيل الجهة المسئولة"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "تعديل تفاصيل الجهة المسئولة"
+msgstr "عدل تفاصيل المستخدمين الآخرين"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
-msgstr ""
+msgstr "عدل صلاحيات المستخدمين الآخرين"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "انشء تصنيف"
+msgstr "عدل تصنيف التقرير"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "ترشيح قائمة البلاغات"
+msgstr "عدل أولوية التقرير"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "التقارير التي تم إصلاحها"
+msgstr "عدل التقارير"
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1038,9 +1012,8 @@ msgstr "البريد أضيف إلى لائحة المسيئين"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "عنوان البريد الإلكتروني:"
+msgstr "البريد الإلكتروني"
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1152,13 +1125,12 @@ msgstr "أمثلة:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "انشء تصنيف"
+msgstr "تصنيف موجود"
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
-msgstr ""
+msgstr "وضح ما هي المشكلة"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
@@ -1168,23 +1140,20 @@ msgid "Extern"
 msgstr "خارجي"
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "رابط خارجي"
+msgstr "معرف خارجي"
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "رابط خارجي"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "رابط خارجي"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "رابط خارجي"
+msgstr "فريق خارجي"
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1192,9 +1161,8 @@ msgid "Extra data:"
 msgstr "بيانات إضافية:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "بيانات إضافية:"
+msgstr "تفاصيل إضافية"
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1281,7 +1249,7 @@ msgstr "اتبع ارتباط الدائرة لعرض التقارير الوا
 
 #: templates/web/base/report/new/after_photo.html:3
 msgid "For best results include a close-up and a wide shot"
-msgstr ""
+msgstr "لنتائج أفضل أرفق لقطة مقربة ولقطة شاملة"
 
 #: templates/web/base/admin/body-form.html:71
 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
@@ -1345,7 +1313,7 @@ msgstr "هل تريد أن ترسل سؤال؟"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
-msgstr ""
+msgstr "إعطاء تصريح للأدمن"
 
 #: templates/web/base/admin/index.html:70
 msgid "Graph of problem creation by status over time"
@@ -1476,9 +1444,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "في حالة تقديم مشكلة هنا، فسيكون عنوان المشكلة وتفاصيلها عامّين، ولكن <strong>لن</strong> يتم الإبلاغ عن المشكلة للمجلس."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1573,13 +1540,12 @@ msgid "Incorrect has_photo value \"%s\""
 msgstr "قيمة has_photo غير صحيحة \"%s\""
 
 #: templates/web/base/admin/contact-form.html:84
-#, fuzzy
 msgid "Inspection required"
-msgstr "الصورة مطلوبة"
+msgstr "يتطلب المعاينة"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
-msgstr ""
+msgstr "وجه المقاولون لإصلاح المشاكل"
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
@@ -1658,9 +1624,8 @@ msgid "Last&nbsp;update:"
 msgstr "آخر تحديث:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "آخر تحديث"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1675,10 +1640,9 @@ msgid "Loading..."
 msgstr "جارٍ التحميل..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "مواجز RSS وتنبيهات البريد الإلكتروني المحلية"
@@ -1741,9 +1705,8 @@ msgid "Message to external body:"
 msgstr "رسالة إلى الهيئة الخارجية:"
 
 #: templates/web/base/admin/report_edit.html:71
-#, fuzzy
 msgid "Missing bodies:"
-msgstr "%s الهيئات"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:446
 msgid "Missing jurisdiction_id"
@@ -1754,14 +1717,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "تضمين البيانات الشخصية للمبلّغ"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "انشئ بلاغ"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1773,7 +1734,7 @@ msgstr "الشهر"
 
 #: templates/web/base/reports/_list-filters.html:39
 msgid "Most commented"
-msgstr ""
+msgstr "الأكثر تعليقا"
 
 #: templates/web/base/admin/bodies.html:25
 #: templates/web/base/admin/body-form.html:24
@@ -1808,9 +1769,8 @@ msgid "Name: %s"
 msgstr "الاسم: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "التحديثات على هذه المشكلة، %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1849,9 +1809,8 @@ msgid "New category contact added"
 msgstr "تمت إضافة جهة اتصال جديدة للفئة"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "عنوان البريد الإلكتروني:"
+msgstr "بريد إلكتروني جديد:"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1867,15 +1826,13 @@ msgid "New note to DM:"
 msgstr "ملاحظة جديدة لرئيس المنطقة:"
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "كلمة المرور:"
+msgstr "كلمة مرور جديدة:"
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "تقارير جديدة"
+msgstr "أولوية جديدة"
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1913,7 +1870,7 @@ msgstr "قالب جديد"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
-msgstr ""
+msgstr "الأحدث"
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
@@ -1936,9 +1893,8 @@ msgid "No"
 msgstr "لا"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "مناطق أخرى:"
+msgstr "لاتوجد منطقة"
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1995,15 +1951,10 @@ msgstr "بلا"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"لا يجوز إقران المستخدمين العاديين (العموميين) بأي <strong>هيئة</strong>.<br>\n"
-"                يمكن إقران المستخدمين الموظفين المعتمدين بالهيئة التي يمثلونها.<br>\n"
-"                تبعًا للتنفيذ، يمكن أن يكون لدى المستخدمين الموظفين حق الوصول إلى لوحة المعلومات (ملخص\n"
-"                الأنشطة عبر الهيئة التي يمثلونها)، أو القدرة على إخفاء التقارير أو تعيين حالات خاصة للتقارير."
 
 #: templates/web/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2099,7 +2050,7 @@ msgstr "المشكلات <br>القديمة"
 
 #: templates/web/base/reports/_list-filters.html:36
 msgid "Oldest"
-msgstr ""
+msgstr "الأقدم"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
@@ -2132,9 +2083,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "واجهة Open311 API لخادم mySociety FixMyStreet"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "مواصفة Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2201,7 +2151,7 @@ msgstr "الارتباط الثابت"
 
 #: templates/web/base/admin/user-form.html:152
 msgid "Permissions:"
-msgstr ""
+msgstr "الصلاحيات:"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
@@ -2250,9 +2200,8 @@ msgstr "الصورة مطلوبة"
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "الصورة"
+msgstr "الصور"
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2306,8 +2255,7 @@ msgid "Please choose a property type"
 msgstr "الرجاء اختيار نوع العقار"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "الرجاء تصحيح الأخطاء التالية"
 
@@ -2337,9 +2285,8 @@ msgid "Please enter a name"
 msgstr "الرجاء إدخال اسمك"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "الرجاء إدخال اسمك"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2465,9 +2412,8 @@ msgid "Please note:"
 msgstr "الرجاء ملاحظة:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "الرجاء توضيح أسباب تقديم هذا التقرير"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2503,7 +2449,7 @@ msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم ح
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
 #: templates/web/base/js/translation_strings.html:54
 msgid "Please upload an image only"
-msgstr ""
+msgstr "الرجاء تحميل صورة فقط"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:115
 msgid "Please write a message"
@@ -2542,11 +2488,11 @@ msgstr "السابق"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:665
 msgid "Priorities"
-msgstr ""
+msgstr "أولويات"
 
 #: templates/web/base/report/_inspect.html:87
 msgid "Priority"
-msgstr ""
+msgstr "أولوية"
 
 #: templates/web/base/footer.html:38
 msgid "Privacy"
@@ -2644,9 +2590,8 @@ msgid "Provide an update"
 msgstr "قدّم تحديثًا"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "قدّم تحديثًا"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2663,9 +2608,8 @@ msgid "Public response:"
 msgstr "الاستجابة العامة:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "الاستجابة العامة:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2750,7 +2694,7 @@ msgstr "استلام بريد إلكتروني عند ترك تحديثات له
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:720
 msgid "Received by %s moments later"
-msgstr ""
+msgstr "استلمت من %s قبل لحظات"
 
 #. ("%s is the site name")
 #: templates/web/base/around/display_location.html:0
@@ -2767,9 +2711,8 @@ msgid "Recently reported problems"
 msgstr "المشاكل المبلغة حديثا"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "احصل على التحديثات"
+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."
@@ -2787,7 +2730,7 @@ msgstr ""
 
 #: templates/web/base/report/display_tools.html:6
 msgid "Remove from site"
-msgstr ""
+msgstr "احذف من الموقع"
 
 #: templates/web/base/admin/report_edit.html:172
 #: templates/web/base/admin/update_edit.html:69
@@ -2804,9 +2747,8 @@ msgid "Report"
 msgstr "إبلاغ"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "إبلاغ"
+msgstr "معرف البلاغ:"
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2819,9 +2761,8 @@ msgid "Report abuse"
 msgstr "الإبلاغ عن إساءة"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "التقارير"
+msgstr "بلغ كـ"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2931,9 +2872,8 @@ msgid "Reports published"
 msgstr "تم نشر التقارير"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "التقارير في انتظار الاعتماد"
+msgstr "التقارير في انتظار الإرسال"
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2956,24 +2896,20 @@ msgid "Response Priorities"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:1
-#, fuzzy
 msgid "Response Priorities for %s"
-msgstr "قوالب الاستجابة لـ %s"
+msgstr "أولويات الاستجابة لـ %s"
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
-#, fuzzy
 msgid "Response Priority for %s"
-msgstr "قوالب الاستجابة لـ %s"
+msgstr "أولوية الاستجابة لـ %s"
 
 #: templates/web/base/admin/template_edit.html:1
-#, fuzzy
 msgid "Response Template for %s"
-msgstr "قوالب الاستجابة لـ %s"
+msgstr "قالب الاستجابة لـ %s"
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "قوالب الاستجابة لـ %s"
+msgstr "قوالب الاستجابة"
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -3041,8 +2977,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "البحث عن تقارير"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "البحث عن مستخدمين"
 
@@ -3067,7 +3002,7 @@ msgstr "لم يعثر البحث عن أي مستخدمين."
 #: templates/web/base/report/new/councils_text_private.html:7
 #: templates/web/base/report/new/form_user.html:5
 msgid "See our privacy policy"
-msgstr ""
+msgstr "انظر سياسة الخصوصية"
 
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
@@ -3088,9 +3023,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr "حدد نوع التنبيه الذي تريده وانقر فوق الزر للحصول على موجز RSS أو أدخل عنوان البريد الإلكتروني للاشتراك في خدمة التنبيه عبر البريد الإلكتروني."
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "الموضوع:"
+msgstr "تحديد:"
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3115,7 +3049,7 @@ msgstr "الخدمة:"
 
 #: templates/web/base/report/_inspect.html:26
 msgid "Set to my current location"
-msgstr ""
+msgstr "اضبط إلى موقعي الحالي"
 
 #: templates/web/base/report/display_tools.html:15
 msgid "Share"
@@ -3134,9 +3068,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "تم النشر بواسطة %s في %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3233,19 +3166,19 @@ msgstr "عذرًا، لم نستطع حفظ الصورة (الصور)، الرج
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
-msgstr ""
+msgstr "للأسف، ليس لديك صلاحية لفعل ذلك."
 
 #: templates/web/base/reports/_list-filters.html:33
 msgid "Sort by"
-msgstr ""
+msgstr "رتب بواسطة"
 
 #: templates/web/base/admin/user-form.html:47
 msgid "Staff users have permission to log in to the admin."
-msgstr ""
+msgstr "مستخدم الموظف لديه الصلاحية للدخول للأدمن"
 
 #: templates/web/base/admin/user-form.html:50
 msgid "Staff:"
-msgstr ""
+msgstr "الموظف:"
 
 #: templates/web/base/admin/stats.html:71
 msgid "Start Date:"
@@ -3272,8 +3205,7 @@ msgstr "الحالة:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3354,20 +3286,17 @@ msgid "Subscribe me to an email alert"
 msgstr "اشتراك في تنبيه البريد الإلكتروني"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "أدخل تفاصيل البلاغ"
+msgstr "لخص المشكلة"
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "تقديم التغييرات"
+msgstr "لخص تغييراتك"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3434,9 +3363,8 @@ msgid "Thank you for updating this issue!"
 msgstr "شكرًا لك على تحديث هذه المشكلة!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "شكرًا لك على تعليقاتك"
+msgstr "شكرًا لك على استفسارك"
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3672,15 +3600,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "لن نستخدم معلوماتك الشخصية إلا وفقًا <a href=\"/privacy\">لسياسة الخصوصية.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/privacy\">لسياسة الخصوصية.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3793,7 +3719,7 @@ msgstr "المخطط الزمني"
 
 #: templates/web/base/report/new/after_photo.html:1
 msgid "Tips for perfect photos"
-msgstr ""
+msgstr "نصائح لصور مثالية"
 
 #: templates/web/base/admin/flagged.html:15
 #: templates/web/base/admin/index.html:55
@@ -3829,7 +3755,7 @@ msgstr "الإجمالي"
 
 #: templates/web/base/report/_inspect.html:98
 msgid "Traffic management required?"
-msgstr ""
+msgstr "هل يتطلب إدارة المرور؟"
 
 #: templates/web/base/admin/user-form.html:111
 msgid "Trusted by bodies:"
@@ -3840,9 +3766,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "تم الإنشاء:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3979,9 +3904,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "استخدم <strong>الملاحظة</strong> لتسجيل التفاصيل التي لا تُعرض إلا في الإدارة. لا تُعرض الملاحظات بصورة عامة، ولا تُرسل إلى الهيئة."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -4007,8 +3931,7 @@ msgstr "عثر البحث الذي نفذه المستخدم على مطابقا
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "المستخدمون"
 
@@ -4248,9 +4171,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "لم تقم بإنشاء أي تقارير حتى الآن. <a href=\"%s\">أبلغ عن مشكلة الآن.</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "لم تقم بإنشاء أي تقارير حتى الآن. <a href=\"%s\">أبلغ عن مشكلة الآن.</a>"
+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."
@@ -4272,9 +4194,8 @@ msgstr "التقارير"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "أكد الحساب"
+msgstr "حسابك"
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4335,9 +4256,8 @@ msgstr "التقارير"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "التقارير"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4345,14 +4265,13 @@ msgstr "التحديثات"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "البريد الإلكتروني"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
 msgid "all"
-msgstr ""
+msgstr "الكل"
 
 #: templates/web/base/admin/timeline.html:4
 msgid "by %s"
@@ -4444,9 +4363,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(إختياري)"
+msgstr "إختياري"
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4481,9 +4399,8 @@ msgid "reopened"
 msgstr "تمت إعادة الفتح"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "required"
-msgstr "الصورة مطلوبة"
+msgstr "مطلوب"
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4643,45 +4560,3 @@ msgstr[2] "<strong>لا</strong> توجد لدينا تفاصيل عن المج
 msgstr[3] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 msgstr[4] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 msgstr[5] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
-
-#~ msgid "(public)"
-#~ msgstr "(عام)"
-
-#~ msgid "Additional Information"
-#~ msgstr "معلومات إضافية"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "كل المعلومات التي تقدمها سترسل إلى"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "كل المعلومات التي تقدمها سترسل إلى <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "تكوين نقطة النهاية"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "أشرح ما الخطأ، وبالضبط أين هو، وكم من المدة وهو هناك..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "موجز GeoRSS على خرائط Google"
-
-#~ msgid "One-line summary"
-#~ msgstr "ملخص من سطر واحد"
-
-#~ msgid "Survey"
-#~ msgstr "استطلاع"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "سيُتاح الملخص والوصف للعامة أيضًا (راجع <a href=\"/privacy\">سياسة الخصوصية</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "لن نظهر البريد الإلكتروني مطلقًا"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهاتف مطلقًا."
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "ما المشكلة، وأين تقع؟"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "هل ترغب بالفعل في إعادة الإرسال؟"
diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
index 47e83e05f..0725b23a6 100644
--- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# dinobg <dinobg@gmail.com>, 2014
-# naidenova <naidenova@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/mysociety/fixmystreet/language/bg_BG/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n"
 "Language: bg_BG\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,9 +277,8 @@ msgid "Add user"
 msgstr "Добавете потребител"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Добавяне на нова категория"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -325,15 +322,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Вички сигнали"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Всички сигнали"
@@ -359,9 +354,8 @@ msgstr "Анонимен:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Добавете потребител"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -373,9 +367,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Ако сте програмист?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -410,9 +403,8 @@ msgid "Assign to subdivision:"
 msgstr "Прехвърляне към подразделение:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Прехвърлен на %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -432,9 +424,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Публичен отговор:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -455,9 +446,8 @@ msgid "Back"
 msgstr "Назад"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Всички сигнали"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -501,14 +491,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Категория"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Категория:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -525,9 +513,8 @@ msgid "Category"
 msgstr "Категория"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "напр. ‘%s’ или ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -553,9 +540,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Забрана на имейл адреса"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -652,9 +638,8 @@ msgid "Closed by council"
 msgstr "Затворен от общината"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Препращане на сигнал"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -785,14 +770,12 @@ msgid "Create category"
 msgstr "Създай категория"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Подай сигнал"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Съгналът не е подаден към общината"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -860,9 +843,8 @@ msgid "Description"
 msgstr "Описание"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Описание"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -953,28 +935,24 @@ msgid "Edit body details"
 msgstr "Редактиране на информацията за района"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Редактиране на информацията за района"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Създай категория"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Филтриране на списъка със сигнали"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Всички сигнали"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1018,9 +996,8 @@ msgstr "Имейлът е добавен в списъка със злоупот
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Имейл адрес:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1125,9 +1102,8 @@ msgstr "Примери:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Създай категория"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1149,14 +1125,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Прехвърляне към външна община:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Вътрешни бележки"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1164,9 +1138,8 @@ msgid "Extra data:"
 msgstr "Допълнителни данни:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Допълнителни данни:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1208,9 +1181,8 @@ msgid "Fixed - User"
 msgstr "Поправени - потребител"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Нови сигнали"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1447,9 +1419,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Ако сигнализирате за проблем тук, той ще бъде достъпен публично, но сигналът <strong>няма</strong> да бъде изпратен към общината."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1618,9 +1589,8 @@ msgid "Last&nbsp;update:"
 msgstr "Последно обновено:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Последно обновено:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1635,10 +1605,9 @@ msgid "Loading..."
 msgstr "Зареждане..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "RSS и имейл известия за сигнали"
@@ -1713,14 +1682,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Редактиране на информацията за района"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Подай сигнал"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1767,9 +1734,8 @@ msgid "Name: %s"
 msgstr "Име: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS абонамент за актуализации по този проблем"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1808,9 +1774,8 @@ msgid "New category contact added"
 msgstr "Категорията е добавена"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Имейл адрес:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1826,15 +1791,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Парола:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Нови сигнали"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1895,9 +1858,8 @@ msgid "No"
 msgstr "Не"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "други територии:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2080,9 +2042,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Липсващо jurisdiction_id"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2198,9 +2159,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Снимка"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2254,8 +2214,7 @@ msgid "Please choose a property type"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2282,9 +2241,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Моля въведете парола"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2410,9 +2368,8 @@ msgid "Please note:"
 msgstr "Забележка:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Моля въведете информация защо отваряте сигнала отново."
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2589,9 +2546,8 @@ msgid "Provide an update"
 msgstr "Въведете иформация за актуализиране"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Въведете иформация за актуализиране"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2608,9 +2564,8 @@ msgid "Public response:"
 msgstr "Публичен отговор:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Публичен отговор:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2712,9 +2667,8 @@ msgid "Recently reported problems"
 msgstr "Наскоро добавени сигнали"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Изтегляне на актуализациите"
+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."
@@ -2749,9 +2703,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Сигнали"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2764,9 +2717,8 @@ msgid "Report abuse"
 msgstr "Сигнализирай за неподходящо съдържание"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Сигнали"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2876,9 +2828,8 @@ msgid "Reports published"
 msgstr "Публикувани сигнали"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Сигнали чакащи одобрение"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2982,8 +2933,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Търсене на Сигнали"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Търсене на Потребители"
 
@@ -3029,9 +2979,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Тема:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3075,9 +3024,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Публикувано от %s в %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3211,8 +3159,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3293,20 +3240,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Абониране за известяване по имейл"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Въведете информация за проблема"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Изпращане на промените"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3595,15 +3539,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Личните Ви данни ще бъдат използвани единствено и само в съответствие с нашата <a href=\"/privacy\">Политика за поверителност.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/privacy\">Политика за поверителност.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3758,9 +3700,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Създадени:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3787,9 +3728,8 @@ msgid "Unconfirmed"
 msgstr "Непотвърден"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Нови сигнали"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3925,8 +3865,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Потребители"
 
@@ -4163,9 +4102,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Все още нямате подадени сигнали. <a href=\"%s\">Подайте сигнал.</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Все още нямате подадени сигнали. <a href=\"%s\">Подайте сигнал.</a>"
+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."
@@ -4187,9 +4125,8 @@ msgstr "Вашите Сигнали"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Потвърждаване на акаунта"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4250,9 +4187,8 @@ msgstr "Вашите сигнали"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Вашите Сигнали"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4260,9 +4196,8 @@ msgstr "Актуализации"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Имейл"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4359,9 +4294,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(незадължително)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4513,24 +4447,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Все още <strong>нямаме</strong> информация за общината, която стопанисва тази територия."
 msgstr[1] "Все още <strong>нямаме</strong> информация за общините, които стопанисват тази територия."
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Цялата информация, която предоставите тук, ще бъде изпратена на "
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Цялата информация, която предоставите тук, ще бъде изпратена на <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Задайте крайна точка"
-
-#~ msgid "Survey"
-#~ msgstr "Проучване"
-
-#~ msgid "We never show your email"
-#~ msgstr "Ние никога не показваме вашия имейл"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Ние никога не показваме вашия имейл или телефонен номер."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Наистина ли искате да го изпратите отново?"
diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
index 341b12a58..ed75512c4 100644
--- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/mysociety/fixmystreet/language/cs_CZ/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -280,9 +280,8 @@ msgid "Add user"
 msgstr "Přidat Uživatele"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Přidat novou kategorii"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -326,15 +325,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Všechna hlášení"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Všechna hlášení"
@@ -360,9 +357,8 @@ msgstr "Anonymní:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Přidat Uživatele"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -374,9 +370,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Jste vývojář?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -411,9 +406,8 @@ msgid "Assign to subdivision:"
 msgstr "Přiřaďte oddělení:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Přířazeno: %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -433,9 +427,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Veřejná reakce:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -456,9 +449,8 @@ msgid "Back"
 msgstr "Zpět"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Všechna hlášení"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -502,14 +494,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Katetorie"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategorie:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -526,9 +516,8 @@ msgid "Category"
 msgstr "Katetorie"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "např. ‘%s’ nebo ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -554,9 +543,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Zakázat emailovou adresu"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -656,9 +644,8 @@ msgid "Closed by council"
 msgstr "Uzavřena úřadem"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Znovu odeslané hlášení"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -789,14 +776,12 @@ msgid "Create category"
 msgstr "Vytvořit kategorii"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Vytvořit report"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Na úřad nebylo hlášeno"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -864,9 +849,8 @@ msgid "Description"
 msgstr "Popis"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Popis"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -953,28 +937,24 @@ msgid "Edit body details"
 msgstr "Editace podrobností subjektu"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Editace podrobností subjektu"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Vytvořit kategorii"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtrovat seznam hlášení"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Všechna hlášení"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1018,9 +998,8 @@ msgstr "E-mail přidán do seznamu zneužívání"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "E-mailová adresa:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1125,9 +1104,8 @@ msgstr "Příklady:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Vytvořit kategorii"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1149,14 +1127,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Přiřaďte externí instituci:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Interní poznámky"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1164,9 +1140,8 @@ msgid "Extra data:"
 msgstr "Doplňující data:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Doplňující data:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1208,9 +1183,8 @@ msgid "Fixed - User"
 msgstr "Vyřešené - Uživatel"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Nová hlášení"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1449,9 +1423,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Pokud zde zadáte své hlášení, nadpis a podrobnosti hlášení budou veřejné, ale hlášení <strong>nebude</strong> doručeno na úřad."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1623,9 +1596,8 @@ msgid "Last&nbsp;update:"
 msgstr "Poslední úpravy:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Poslední úpravy:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1640,10 +1612,9 @@ msgid "Loading..."
 msgstr "Nahrávání..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokální RSS kanály a mailové upozornění"
@@ -1718,14 +1689,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Zahrnuty osobní údaje hlasatele problému"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Vytvořit report"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1772,9 +1741,8 @@ msgid "Name: %s"
 msgstr "Jméno: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS kanál aktualizací tohoto hlášení"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1815,9 +1783,8 @@ msgid "New category contact added"
 msgstr "Do kategorie byl přidán nový kontakt"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "E-mailová adresa:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1833,15 +1800,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Heslo:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Nová hlášení"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1902,9 +1867,8 @@ msgid "No"
 msgstr "Ne"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "ostatní oblasti:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1961,15 +1925,10 @@ msgstr "Žádné"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"Normální uživatelé (veřejnost) by neměli být přiřazeni k žádnému <strong>subjektu</strong>.<br>\n"
-"                Autorizovaní zaměstnanci mohou být registrováni jejich úřady, které zastupují.<br>\n"
-"                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/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2098,9 +2057,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API pro server mySociety FixMyStreet"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Specifikace systému Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2216,9 +2174,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Fotografie"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2272,8 +2229,7 @@ msgid "Please choose a property type"
 msgstr "Zvolte typ nemovitosti"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Opravte prosím chyby uvedené níže"
 
@@ -2300,9 +2256,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Prosím zadejte heslo"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2428,9 +2383,8 @@ msgid "Please note:"
 msgstr "Vezměte prosím na vědomí:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2607,9 +2561,8 @@ msgid "Provide an update"
 msgstr "Poskytněte aktuální informace"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Poskytněte aktuální informace"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2626,9 +2579,8 @@ msgid "Public response:"
 msgstr "Veřejná reakce:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Veřejná reakce:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2730,9 +2682,8 @@ msgid "Recently reported problems"
 msgstr "Nedávno nahlášené problémy"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Zasílání aktualizací"
+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."
@@ -2767,9 +2718,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Hlášení"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2782,9 +2732,8 @@ msgid "Report abuse"
 msgstr "Nevhodný obsah"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Hlášení"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2894,9 +2843,8 @@ msgid "Reports published"
 msgstr "Publikovaná hlášení"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Hlášení čekající na schválení"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -3000,8 +2948,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Vyhledat hlášení"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Vyhledat uživatele"
 
@@ -3047,9 +2994,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Předmět:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3093,9 +3039,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Odesláno uživatelem  %s v %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3229,8 +3174,7 @@ msgstr "Stav:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3311,20 +3255,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Přihlásit se k odběru emailových upozornění"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Uveďte podrobnosti daného problému"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Odeslat změny"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3624,15 +3565,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Osobní údaje budeme používat pouze v souladu s našimi <a href=\"/privacy\"> zásadami ochrany osobních údajů.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Osobní údaje budeme používat pouze v souladu s našimi <a href=\"/privacy\"> zásadami ochrany osobních údajů.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3792,9 +3731,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Vytvořeno:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3821,9 +3759,8 @@ msgid "Unconfirmed"
 msgstr "Nepotvrzeno"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Nová hlášení"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3932,9 +3869,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "<strong> Poznámka </strong> slouží pro záznam ifnormací, které jsou zobrazeny pouze v administraci. Poznámky nejsou zobrazeny veřejně a nejsou odeslány subjektům."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3960,8 +3896,7 @@ msgstr "Při vyhledávání byly nalezeny shody  v uživatelských jménech nebo
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Uživatelé"
 
@@ -4200,9 +4135,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Doposud jste nevytvořili žádné hlášení.  <a href=\"%s\">Nahlaste problém nyní.</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Doposud jste nevytvořili žádné hlášení.  <a href=\"%s\">Nahlaste problém nyní.</a>"
+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."
@@ -4224,9 +4158,8 @@ msgstr "Vaše hlášení"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Potvrdit účet"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4287,9 +4220,8 @@ msgstr "Vaše hlášení"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Vaše hlášení"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4297,9 +4229,8 @@ msgstr "Vaše aktualizace"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Váš e-mail"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4396,9 +4327,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(volitelně)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4561,42 +4491,3 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti  o dalším úřadě, který je za tuto oblast zodpovědný."
 msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti  o dalších úřadech, které jsou za tuto oblast zodpovědné."
 msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti  o dalších úřadech, které jsou za tuto oblast zodpovědné."
-
-#~ msgid "(public)"
-#~ msgstr "(veřejné)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Veškeré vámi poskytnuté informace budou zaslány "
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Veškeré vámi poskytnuté informace budou zaslány <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Nastavení Endpointu"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Vysvětlete, co je špatně a kde, případně jak dlouho to již trvá a tp. ..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS na Google Mapách"
-
-#~ msgid "One-line summary"
-#~ msgstr "jednořádkový nadpis"
-
-#~ msgid "Survey"
-#~ msgstr "Průzkum"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Souhrn a popisy budou také veřejné (čtěte naše<a href=\"/privacy\">zásady ochrany osobních údajů</a>)"
-
-#~ msgid "We never show your email"
-#~ msgstr "váš email nebude nezveřejněn"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Váš email a telefonní číslo nebudou nikde zveřejněny."
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "Co je to za problém, a kde to je?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Chcete to skutečně znovu odeslat?"
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2e7128820..3c58dcb88 100644
--- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# ciaran, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -275,9 +274,8 @@ msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Ychwanegu categori newydd"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -321,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Pob adroddiad"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Pob adroddiad"
@@ -355,9 +351,8 @@ msgstr "Dienw:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Ychwanegu defnyddiwr"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -369,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Ydych chi'n ddatblygwr?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -427,9 +421,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Ymateb cyhoeddus:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -450,9 +443,8 @@ msgid "Back"
 msgstr "Yn ôl"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Pob adroddiad"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -496,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Categori"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Categori:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -520,9 +510,8 @@ msgid "Category"
 msgstr "Categori"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "e.e. '%s' neu '%s'"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -548,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Eich cyfeiriad e-bost"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -638,9 +626,8 @@ msgid "Closed by council"
 msgstr "Caewyd gan y cyngor"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Ailanfon adrodd"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -771,14 +758,12 @@ msgid "Create category"
 msgstr "Creu categori"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Creu adroddiad"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor."
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -846,9 +831,8 @@ msgid "Description"
 msgstr "Disgrifiad"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Disgrifiad"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -935,27 +919,24 @@ msgid "Edit body details"
 msgstr "Golygu manylion y corff"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Golygu manylion y corff"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Creu categori"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Pob adroddiad"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -999,9 +980,8 @@ msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Cyfeiriad e-bost:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1106,9 +1086,8 @@ msgstr "Enghraifft:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Creu categori"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1122,23 +1101,20 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "URL allanol"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "URL allanol"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "URL allanol"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "URL allanol"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1146,9 +1122,8 @@ msgid "Extra data:"
 msgstr "Data ychwanegol:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Data ychwanegol:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1190,9 +1165,8 @@ msgid "Fixed - User"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Adroddiadau newydd"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1427,9 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Os cyflwynwch chi broblem yma, bydd y pwnc a manylion y broblem yn gyhoeddus, ond <strong>ni</strong> chaiff y broblem ei hanfon at y cyngor."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1598,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Diweddariad&nbsp;diwethaf:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Diweddariad diwethaf:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1615,10 +1587,9 @@ msgid "Loading..."
 msgstr "Wrthi'n llwytho..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Ffrydiau RSS lleol a hysbysiadau e-bost"
@@ -1693,14 +1664,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Golygu manylion y corff"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Creu adroddiad"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1747,9 +1716,8 @@ msgid "Name: %s"
 msgstr "Enw: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1788,9 +1756,8 @@ msgid "New category contact added"
 msgstr ""
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Cyfeiriad e-bost:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1806,15 +1773,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Cyfrinair:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Adroddiadau newydd"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1875,9 +1840,8 @@ msgid "No"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "ardaloedd eraill:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2060,9 +2024,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "API Open311 i weinydd mySociety FixMyStreet"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "jurisdiction_id coll"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2178,9 +2141,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Llun"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2234,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2262,9 +2223,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Rhowch gyfrinair"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2390,9 +2350,8 @@ msgid "Please note:"
 msgstr "Noder:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Ysgrifennwch eich diweddariad yma"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2569,9 +2528,8 @@ msgid "Provide an update"
 msgstr "Darparu diweddariad"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Darparu diweddariad"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2588,9 +2546,8 @@ msgid "Public response:"
 msgstr "Ymateb cyhoeddus:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Ymateb cyhoeddus:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2692,9 +2649,8 @@ msgid "Recently reported problems"
 msgstr "Problemau a adroddwyd yn ddiweddar"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Derbyn diweddariadau"
+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."
@@ -2729,9 +2685,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Adroddiadau"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2744,9 +2699,8 @@ msgid "Report abuse"
 msgstr "Adrodd camddefnydd"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Adroddiadau"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2961,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Chwilio am adroddiadau"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Chwilio am ddefnyddwyr"
 
@@ -3008,9 +2961,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Pwnc:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3054,9 +3006,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Postiwyd gan %s am %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3190,8 +3141,7 @@ msgstr "Cyflwr:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3272,20 +3222,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Tanysgrifio i hysbysiad e-bost"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Rhowch fanylion am y broblem"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Cyflwyno newidiadau"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3352,9 +3299,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Diolch am ddiweddaru'r broblem!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Diolch am eich adborth"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3573,15 +3519,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n  <a href=\"/privacy\">polisi preifatrwydd.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n  <a href=\"/privacy\">polisi preifatrwydd.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3736,9 +3680,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Crëwyd:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3765,9 +3708,8 @@ msgid "Unconfirmed"
 msgstr "Heb ei gadarnhau"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Adroddiadau newydd"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3876,9 +3818,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma yn unig. Ni ddangosir nodiadau'n gyhoeddus, ac ni chânt eu hanfon at y corff."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3904,8 +3845,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Defnyddwyr"
 
@@ -4224,9 +4164,8 @@ msgstr "Eich adroddiadau"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Eich adroddiadau"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4234,9 +4173,8 @@ msgstr "Eich diweddariadau"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Eich e-bost"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4333,9 +4271,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(dewisol)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4509,36 +4446,3 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
-
-#~ msgid "(public)"
-#~ msgstr "(cyhoeddus)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Anfonir yr holl wybodaeth a roddir yma at"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Anfonir yr holl wybodaeth a roddir yma at <strong>%s</strong>."
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS ar Google Maps"
-
-#~ msgid "One-line summary"
-#~ msgstr "Crynodeb byr"
-
-#~ msgid "Survey"
-#~ msgstr "Arolwg"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Bydd y crynodeb a'r disgrifiad yn gyhoeddus (gweler ein <a href=\"/privacy\">polisi preifatrwydd</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "Ni ddatgelir eich e-bost"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "Beth yw'r broblem, a ble mae hi?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Ydych chi wir am ailanfon?"
diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4a717cb1d..28eb67ce4 100644
--- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,21 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Guttorm Flatabø <post@guttormflatabo.com>, 2013
-# Keld Simonsen <keld@rap.dk>, 2015
-# Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015
-# Ørjan Vøllestad <orjanv@gmail.com>, 2014
-# pere <pere-transifex@hungry.com>, 2012,2015
-# Petter Reinholdtsen <pere@hungry.com>, 2011
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/mysociety/fixmystreet/language/da_DK/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n"
 "Language: da_DK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -280,9 +274,8 @@ msgid "Add user"
 msgstr "Tilføj bruger"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Tilføj ny kategori"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -326,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Alle rapporter"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alle rapporter"
@@ -360,9 +351,8 @@ msgstr "Anonym:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Tilføj bruger"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -374,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Er du en udvikler?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -411,9 +400,8 @@ msgid "Assign to subdivision:"
 msgstr "Tildelt underafdeling:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Tildelt %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -433,9 +421,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Offentlig respons:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -456,9 +443,8 @@ msgid "Back"
 msgstr "Tilbage"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Alle rapporter"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -502,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategori"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategori:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -526,9 +510,8 @@ msgid "Category"
 msgstr "Kategori"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "for eksempel '%s' eller '%s'"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -554,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Bandlys epostadresse"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -653,9 +635,8 @@ msgid "Closed by council"
 msgstr "Lukket af myndigheden"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Send rapport igen"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -786,14 +767,12 @@ msgid "Create category"
 msgstr "Lav kategori"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Lav en rapport"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Ikke rapporteret til myndigheden"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -861,9 +840,8 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Beskrivelse"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -953,28 +931,24 @@ msgid "Edit body details"
 msgstr "Redigér detaljer for myndighed"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Redigér detaljer for myndighed"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Lav kategori"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtrér rapportliste"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Alle rapporter"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1018,9 +992,8 @@ msgstr "Epost lagt til misbrugsliste"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "E-postadresse:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1131,9 +1104,8 @@ msgstr "Eksempler:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Lav kategori"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1147,23 +1119,20 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "Eksternt link"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "Eksternt link"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Eksternt link"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Eksternt link"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1171,9 +1140,8 @@ msgid "Extra data:"
 msgstr "Ekstra data:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Ekstra data:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1215,9 +1183,8 @@ msgid "Fixed - User"
 msgstr "Løst - Bruger"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Nye rapporter"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1452,9 +1419,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Hvis du indsender et problem her, så vil emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> blive rapportert til myndigheden."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1630,9 +1596,8 @@ msgid "Last&nbsp;update:"
 msgstr "Sidste&nbsp;opdatering:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Sidste opdatering:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1647,10 +1612,9 @@ msgid "Loading..."
 msgstr "Indlæser..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokale RSS-strømme og e-postvarsler"
@@ -1725,14 +1689,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Inkludér rapportørens personlige detaljer"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Lav en rapport"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1779,9 +1741,8 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS-strøm med opdateringer for dette problem"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1822,9 +1783,8 @@ msgid "New category contact added"
 msgstr "Ny kategorikontakt tilføjet"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "E-postadresse:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1840,15 +1800,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Adgangskode:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Nye rapporter"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1909,9 +1867,8 @@ msgid "No"
 msgstr "Nej"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "andre områder:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1969,15 +1926,10 @@ msgstr "Ingen"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"Normale (offentlige) brugere bør ikke være forbundet med nogen <strong>instans</ strong>. <br>\n"
-"Autoriserede brugere i staben kan være forbundet med den instansen de representerer. <br>\n"
-"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/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2106,9 +2058,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311-API for mySocietys FixMinVej-server"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311-specifikation"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2224,9 +2175,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Billed"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2280,8 +2230,7 @@ msgid "Please choose a property type"
 msgstr "Vælg en type egenskab"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Husk at rette op på fejlene nedenfor."
 
@@ -2308,9 +2257,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Indtast en adgangskode"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2438,9 +2386,8 @@ msgid "Please note:"
 msgstr "Venligst bemærk:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Venligst bidrag med en forklaring på hvorfor du genåbner denne problemrapport"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2617,9 +2564,8 @@ msgid "Provide an update"
 msgstr "Bidrag med en opdatering"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Bidrag med en opdatering"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2636,9 +2582,8 @@ msgid "Public response:"
 msgstr "Offentlig respons:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Offentlig respons:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2740,9 +2685,8 @@ msgid "Recently reported problems"
 msgstr "Nyligt meldte problemer"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Få opdateringer"
+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."
@@ -2777,9 +2721,8 @@ msgid "Report"
 msgstr "Rapport"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Rapport"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2792,9 +2735,8 @@ msgid "Report abuse"
 msgstr "Rapportér misbrug"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Rapporter"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2904,9 +2846,8 @@ msgid "Reports published"
 msgstr "Publicerede rapporter"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Rapporter som venter på godkendelse"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -3010,8 +2951,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Søg i rapporter"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søg i brugere"
 
@@ -3057,9 +2997,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Emne:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3103,9 +3042,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Sendt ind af %s %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3242,8 +3180,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3324,20 +3261,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Jeg ønsker at abonnere på e-postvarsel"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Indtast detaljer om problemet"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Indsend ændringer"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3404,9 +3338,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Tak for at du opdaterede dette problem!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Tak for din tilbagemelding"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3645,15 +3578,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Vi vil kun bruge personlig information om dig i henhold til vore <a href=\"/faq#privacy\">privatlivssregler.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Vi vil kun bruge personlig information om dig i henhold til vore <a href=\"/faq#privacy\">privatlivssregler.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3813,9 +3744,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Oprettet:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3842,9 +3772,8 @@ msgid "Unconfirmed"
 msgstr "Ubekræftet"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Nye rapporter"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3953,9 +3882,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Brug <strong>notater</strong> for at notere detaljer som skal vises i admin-grænsefladen. Notater vises ikke offentligt og bliver ikke sendt til myndigheden."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3981,8 +3909,7 @@ msgstr "Brugersøgning finder træf på brugernavne og epostadresser. "
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brugere"
 
@@ -4221,9 +4148,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Du har ikke lavet en rapport endnu. <a href=\"%s\">Rapportér et problem nu.</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Du har ikke lavet en rapport endnu. <a href=\"%s\">Rapportér et problem nu.</a>"
+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."
@@ -4244,9 +4170,8 @@ msgstr "Dine rapporter"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Bekræft konto"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4307,9 +4232,8 @@ msgstr "Dine opdateringer"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Dine rapporter"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4317,9 +4241,8 @@ msgstr "Dine opdateringer"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Din e-post"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4416,9 +4339,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(valgfrit)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4570,42 +4492,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted."
 msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted."
-
-#~ msgid "(public)"
-#~ msgstr "(offentlig)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Al informationen du har lagt ind her vil blive sendt til"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "All informationen du har lagt ind her vil blive sendt til <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Opsæt endepunkt"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Forklar hvad som er galt, nøjagtigt hvor det er og hvor længe det har været galt..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS på Google Maps"
-
-#~ msgid "One-line summary"
-#~ msgstr "Enlinjers opsummering"
-
-#~ msgid "Survey"
-#~ msgstr "Spørgeundersøgelse"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Opsummeringen og beskrivelsen vil også blive offentliggjort (se vores <a href=\"/privacy\">personvernregler</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "Vi viser aldrig din e-postadresse"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "Hvad er problemet og hvor er det?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Ønsker du virkelig at sende igen?"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index 7fea013c9..30afe7f64 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,22 +3,20 @@
 # 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>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-11-24 14:57+0100\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: German (Switzerland) (http://www.transifex.com/mysociety/fixmystreet/language/de_CH/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n"
 "Language: de_CH\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 1.8.11\n"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:639
 #: perllib/FixMyStreet/Script/Reports.pm:199
@@ -63,7 +61,7 @@ msgstr ""
 #: 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 interne Stellen &ndash; %s best&auml;tigt, %s unbest&auml;tigt"
+msgstr ""
 
 #. ("%s is the site name")
 #: templates/web/base/alert/index.html:7
@@ -182,7 +180,7 @@ msgstr ""
 
 #: templates/web/base/admin/response_templates_select.html:4
 msgid "--Choose a template--"
-msgstr "Vorlage wählen"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -277,7 +275,7 @@ msgstr "User hinzuf&uuml;gen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
-msgstr "F&uuml;ge neue Kategorie hinzu"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -285,7 +283,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
-msgstr "Vorlagen für %s"
+msgstr ""
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -322,7 +320,7 @@ msgstr "Als CSV exportieren"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
-msgstr "Alle Kategorien"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
@@ -354,7 +352,7 @@ msgstr "Anonym"
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
 msgid "Another user"
-msgstr "User hinzuf&uuml;gen"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -403,7 +401,7 @@ msgstr "An Fachbereich zuweisen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
-msgstr "User an Gegenden zuweisen"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -424,7 +422,7 @@ msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
 msgid "Auto-response:"
-msgstr "R&uuml;ckmeldung an User"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -433,7 +431,7 @@ msgstr ""
 
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
-msgstr "Verhindern Sie pers&ouml;nliche Informationen wie Kfz-Kennzeichen oder Personen"
+msgstr ""
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:401
 #: templates/web/zurich/report/_item.html:9
@@ -446,7 +444,7 @@ msgstr "Zur&uuml;ck"
 
 #: templates/web/base/report/_main.html:6
 msgid "Back to all reports"
-msgstr "Alle Meldungen"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -491,11 +489,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
-msgstr "Kategorie"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
 msgid "Categories:"
-msgstr "Kategorie:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -513,7 +511,7 @@ msgstr "Kategorie"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "Kategorie von ‘%s’ nach ‘%s’ ge&auml;ndert"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -540,7 +538,7 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
 msgid "Change email address"
-msgstr "E-Mail Adresse &auml;ndern"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -761,7 +759,7 @@ msgstr "Kategorie erstellen"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
 msgid "Create priority"
-msgstr "Priorit&auml;t erstellen"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "Create reports/updates as the council"
@@ -834,7 +832,7 @@ msgstr "Beschreibung"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
 msgid "Description:"
-msgstr "Beschreibung"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -922,7 +920,7 @@ msgstr "Details editieren"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
-msgstr "User-Details editieren"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
@@ -930,15 +928,15 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report category"
-msgstr "Kategorie editieren"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
-msgstr "Priorit&auml;t editieren"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit reports"
-msgstr "Meldungen editieren"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -983,7 +981,7 @@ msgstr ""
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
 msgid "Email address"
-msgstr "Ihre E-Mail Adresse"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1089,7 +1087,7 @@ msgstr "Beispiele:"
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
 msgid "Existing category"
-msgstr "Bestehende Kategorie"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1112,11 +1110,11 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
 msgid "External body"
-msgstr "Externe Stelle"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
 msgid "External team"
-msgstr "Externes Team"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1125,7 +1123,7 @@ msgstr ""
 
 #: templates/web/base/report/_inspect.html:107
 msgid "Extra details"
-msgstr "Zus&auml;tzliche Details"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1212,7 +1210,7 @@ msgstr ""
 
 #: templates/web/base/report/new/after_photo.html:3
 msgid "For best results include a close-up and a wide shot"
-msgstr "Machen Sie ein Detail- und ein &Uuml;bersichtsfoto"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:71
 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
@@ -1304,7 +1302,7 @@ msgstr "Hilfe"
 #: templates/web/base/report/new/category_extras.html:13
 #: templates/web/base/report/new/category_extras.html:14
 msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
-msgstr "Helfen Sie <strong>%s</strong> Ihre Meldung zu bearbeiten indem Sie zus&auml;tzliche Informationen angeben."
+msgstr ""
 
 #: templates/web/base/alert/_list.html:9
 msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
@@ -1490,7 +1488,7 @@ msgstr ""
 
 #: templates/web/base/admin/contact-form.html:84
 msgid "Inspection required"
-msgstr "Kontrolle notwendig"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
@@ -1574,7 +1572,7 @@ msgstr "Letzte Bearbeitung"
 
 #: templates/web/base/reports/_list-filters.html:38
 msgid "Least recently updated"
-msgstr "&Auml;lteste Bearbeitung"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1667,11 +1665,11 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Moderate report details"
-msgstr "Meldungsdetails anpassen"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
 msgid "Moderate this report"
-msgstr "Meldung anpassen"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1683,7 +1681,7 @@ msgstr "Monat"
 
 #: templates/web/base/reports/_list-filters.html:39
 msgid "Most commented"
-msgstr "Am meisten kommentiert"
+msgstr ""
 
 #: templates/web/base/admin/bodies.html:25
 #: templates/web/base/admin/body-form.html:24
@@ -1719,7 +1717,7 @@ msgstr "Name: %s"
 
 #: templates/web/base/report/_inspect.html:23
 msgid "Navigate to this problem"
-msgstr "Zu dieser Meldung zoomen"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1759,7 +1757,7 @@ msgstr ""
 
 #: templates/web/base/auth/change_email.html:26
 msgid "New email address:"
-msgstr "Neue E-Mail Adresse"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1776,12 +1774,12 @@ msgstr "Neue Nachricht an die Kommunikation"
 
 #: templates/web/base/auth/change_password.html:35
 msgid "New password:"
-msgstr "Neues Passwort"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
 msgid "New priority"
-msgstr "Neue Priorit&auml;t"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1819,7 +1817,7 @@ msgstr "Neue Vorlage"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
-msgstr "Neueste"
+msgstr ""
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
@@ -1993,7 +1991,7 @@ msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:36
 msgid "Oldest"
-msgstr "&Auml;lteste"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
@@ -2144,7 +2142,7 @@ msgstr "Foto ben&ouml;tigt"
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
 msgid "Photos"
-msgstr "Fotos"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2226,7 +2224,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
 msgid "Please enter a name for this body"
-msgstr "Obligatorisches Feld"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2531,7 +2529,7 @@ msgstr "Meldung aktualisieren"
 
 #: templates/web/base/report/update/form_name.html:9
 msgid "Provide update as"
-msgstr "Meldung aktualisieren als"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2549,7 +2547,7 @@ msgstr "R&uuml;ckmeldung an User"
 
 #: templates/web/base/report/_inspect.html:125
 msgid "Public update:"
-msgstr "R&uuml;ckmeldung an User"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2652,7 +2650,7 @@ msgstr "K&uuml;rzlich erfasste Meldungen:"
 
 #: templates/web/base/reports/_list-filters.html:37
 msgid "Recently updated"
-msgstr "Neueste Bearbeitung"
+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."
@@ -2688,7 +2686,7 @@ msgstr "Meldung"
 
 #: templates/web/base/report/_inspect.html:11
 msgid "Report ID:"
-msgstr "Meldungs-ID"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2702,7 +2700,7 @@ msgstr "Missbrauch melden"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
 msgid "Report as"
-msgstr "Melden als"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2813,7 +2811,7 @@ msgstr "Beantwortet"
 
 #: templates/web/base/admin/index.html:50
 msgid "Reports waiting to be sent"
-msgstr "Ausstehender Meldungsversand"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2836,24 +2834,20 @@ msgid "Response Priorities"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:1
-#, fuzzy
 msgid "Response Priorities for %s"
-msgstr "Vorlagen für %s"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
-#, fuzzy
 msgid "Response Priority for %s"
-msgstr "Vorlagen für %s"
+msgstr ""
 
 #: templates/web/base/admin/template_edit.html:1
-#, fuzzy
 msgid "Response Template for %s"
-msgstr "Vorlagen für %s"
+msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "Vorlagen für %s"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -2968,7 +2962,7 @@ msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
 msgid "Select:"
-msgstr "Ausw&auml;hlen"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3112,7 +3106,7 @@ msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:33
 msgid "Sort by"
-msgstr "Sortieren nach"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:47
 msgid "Staff users have permission to log in to the admin."
@@ -3228,13 +3222,12 @@ msgid "Subscribe me to an email alert"
 msgstr ""
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Beschreiben Sie den Schaden"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
 msgid "Summarise your changes"
-msgstr "Fassen Sie Ihre &Auml;nderungen zusammen"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
@@ -3474,7 +3467,7 @@ msgstr ""
 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 "Namen m&uuml;ssen nicht eindeutig sein."
+msgstr ""
 
 #: templates/web/base/around/on_map_list_items.html:12
 #: templates/web/base/my/_problem-list.html:8
@@ -3526,15 +3519,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Ihre pers&ouml;nlichen Angaben werden nur f&uuml;r interne Zwecke verwendet und nicht ver&ouml;ffentlicht."
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Ihre pers&ouml;nlichen Angaben werden nur f&uuml;r interne Zwecke verwendet und nicht ver&ouml;ffentlicht."
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3690,7 +3681,7 @@ msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
 msgid "Trusted:"
-msgstr "Vertrauensw&uuml;rdig"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3849,7 +3840,7 @@ msgstr ""
 
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
-msgstr "Diese Suche sucht in den Namen der Ben&uuml;tzer und deren E-Mail-Adressen."
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
@@ -4112,7 +4103,7 @@ msgstr "Ihre Meldungen"
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
 msgid "Your account"
-msgstr "Ihr Account"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4174,7 +4165,7 @@ 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 "Ihre Favoriten"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4183,7 +4174,7 @@ msgstr ""
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
 msgid "Yourself"
-msgstr "Sie selbst"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4281,7 +4272,7 @@ msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
 msgid "optional"
-msgstr "optional"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4317,7 +4308,7 @@ msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
 msgid "required"
-msgstr "ben&ouml;tigt"
+msgstr ""
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4433,12 +4424,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] ""
 msgstr[1] ""
-
-#~ msgid "Additional Information"
-#~ msgstr "Zusätzliche Angaben"
-
-#~ msgid "We never show your email"
-#~ msgstr "Ihr E-Mail wird nie angezeigt"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt"
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index b7b1a19dc..f2de680b8 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2015
-# MatHut <mathias.huter@gmail.com>, 2014
-# Thomas Tursics <thomas@tursics.de>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-06-30 13:48+0000\n"
-"Last-Translator: Thomas Tursics <thomas@tursics.de>\n"
-"Language-Team: German (Germany) (http://www.transifex.com/mysociety/fixmystreet/language/de_DE/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2016\n"
+"Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,9 +179,8 @@ msgid "-- Pick a property type --"
 msgstr "-- Wählen Sie eine Eigentumsart --"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "Wählen Sie eine Vorlage aus"
+msgstr "--Wählen Sie eine Vorlage aus--"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -278,9 +274,8 @@ msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "F&uuml;ge neue Kategorie hinzu"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -324,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr "Alle Berichte als CSV"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Alle Meldungen"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alle Meldungen"
@@ -358,9 +351,8 @@ msgstr "Anonym:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Benutzer hinzufügen"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -372,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Sind Sie ein Entwickler?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -452,9 +443,8 @@ msgid "Back"
 msgstr "Zurück"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "alle Berichte"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -498,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategorie"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategorie:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -522,9 +510,8 @@ msgid "Category"
 msgstr "Kategorie"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "z.B. ‘%s’ oder ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -550,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Ihre eMail-Adresse"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -640,9 +626,8 @@ msgid "Closed by council"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "geschlossene Berichte"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -773,9 +758,8 @@ msgid "Create category"
 msgstr "Kategorie erstellen"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Erfasse eine Meldung"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "Create reports/updates as the council"
@@ -847,9 +831,8 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Beschreibung"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -936,28 +919,24 @@ msgid "Edit body details"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Bitte geben Sie einiges Details an"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Kategorie erstellen"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Berichtliste filtern"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Alle Meldungen"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1001,9 +980,8 @@ msgstr ""
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "E-Mail-Adresse:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1108,9 +1086,8 @@ msgstr "Beispiele:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Kategorie erstellen"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1124,23 +1101,20 @@ msgid "Extern"
 msgstr "Extern"
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "Externe URL"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "Externe URL"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Externe URL"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Externe URL"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1148,9 +1122,8 @@ msgid "Extra data:"
 msgstr "Zusätzliche Daten:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Zusätzliche Daten:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1192,9 +1165,8 @@ msgid "Fixed - User"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Neue Berichte"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1515,9 +1487,8 @@ msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:84
-#, fuzzy
 msgid "Inspection required"
-msgstr "Foto erforderlich"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
@@ -1600,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Letzte&nbsp;Aktualisierung:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Letzte Bearbeitung"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1617,10 +1587,9 @@ msgid "Loading..."
 msgstr "Lade..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 ""
@@ -1699,9 +1668,8 @@ msgid "Moderate report details"
 msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Erfasse eine Meldung"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1748,9 +1716,8 @@ msgid "Name: %s"
 msgstr "Name: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Aktualisierungen für dieses Problem, %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1789,9 +1756,8 @@ msgid "New category contact added"
 msgstr ""
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "E-Mail-Adresse:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1807,15 +1773,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Passwort:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Neue Berichte"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1876,9 +1840,8 @@ msgid "No"
 msgstr "Nein"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "andere Gebiete:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2061,9 +2024,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Fehlendes jurisdiction_id"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2179,9 +2141,8 @@ msgstr "Foto erforderlich"
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2235,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr "Bitte wählen Sie eine Eigentumsart"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Bitte korrigieren Sie die Fehler unten"
 
@@ -2263,9 +2223,8 @@ msgid "Please enter a name"
 msgstr "Bitte geben Sie Ihren Namen ein"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Bitte geben Sie Ihren Namen ein"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2391,9 +2350,8 @@ msgid "Please note:"
 msgstr "Hinweise:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Bitte schreiben Sie hier Ihre Aktualisierung"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2570,9 +2528,8 @@ msgid "Provide an update"
 msgstr "Meldung aktualisieren"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Meldung aktualisieren"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2589,9 +2546,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s Aktualisierungen in Echtzeit"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2693,9 +2649,8 @@ msgid "Recently reported problems"
 msgstr "K&uuml;rzlich erfasste Meldungen"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Aktualisierungen holen"
+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."
@@ -2730,9 +2685,8 @@ msgid "Report"
 msgstr "Bericht"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Bericht"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2745,9 +2699,8 @@ msgid "Report abuse"
 msgstr "Missbrauch melden"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Berichte"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2857,9 +2810,8 @@ msgid "Reports published"
 msgstr "Berichte veröffentlicht"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Berichte warten auf Moderation"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2894,9 +2846,8 @@ msgid "Response Template for %s"
 msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "Vorlagen"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -2964,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Berichte suchen"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Benutzer suchen"
 
@@ -3011,9 +2961,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Titel:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3192,8 +3141,7 @@ msgstr "Status:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3274,20 +3222,17 @@ msgid "Subscribe me to an email alert"
 msgstr ""
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Beschreiben sie den Mangel"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Änderungen senden"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3354,9 +3299,8 @@ msgid "Thank you for updating this issue!"
 msgstr ""
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Vielen Dank für Ihre Rückmeldung"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3736,9 +3680,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Erstellt:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3765,9 +3708,8 @@ msgid "Unconfirmed"
 msgstr "Unbest&auml;tigt"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Neue Berichte"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3903,8 +3845,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Benutzer"
 
@@ -4161,9 +4102,8 @@ msgstr "Ihre Berichte"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Konto bestätigen"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4224,9 +4164,8 @@ msgstr "Ihre Meldungen"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Ihre Berichte"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4234,9 +4173,8 @@ msgstr "Ihre Aktualisierungen"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Ihre eMail"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4333,9 +4271,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(optional)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4370,9 +4307,8 @@ msgid "reopened"
 msgstr "erneut geöffnet"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "required"
-msgstr "Foto erforderlich"
+msgstr ""
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4488,27 +4424,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] ""
 msgstr[1] ""
-
-#~ msgid "(public)"
-#~ msgstr "(öffentlich)"
-
-#~ msgid "Additional Information"
-#~ msgstr "Zusätzliche Informationen"
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Endpunkt konfigurieren"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS auf Google Maps"
-
-#~ msgid "Survey"
-#~ msgstr "Umfrage"
-
-#~ msgid "We never show your email"
-#~ msgstr "Ihre eMail wird nie angezeigt"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Möchten Sie wirklich erneut senden?"
diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
index c02169776..c98d5db3a 100644
--- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,20 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Adrian Pappas <pappasadrian@gmail.com>, 2015-2016
-# basanas1606, 2015
-# Theodore D <diamaltho@gmail.com>, 2015-2016
-# Vassilis Perantzakis <vaspervnp@yahoo.gr>, 2015
-# Σίμος Δαλκυριάδης <press@pirateparty.gr>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-09-20 19:34+0000\n"
-"Last-Translator: Theodore D <diamaltho@gmail.com>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/mysociety/fixmystreet/language/el_GR/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n"
 "Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -198,9 +193,8 @@ msgid "-- Pick a property type --"
 msgstr "-- Διάλεξε είδος ακινήτου --"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "Διάλεξε ένα πρότυπο"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -299,18 +293,16 @@ msgid "Add user"
 msgstr "Προσθήκη χρήστη"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Προσθήκη νέας κατηγορίας"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
-#, fuzzy
 msgid "Add/edit response templates"
-msgstr "Πρότυπα απαντήσεων για %s"
+msgstr ""
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -346,15 +338,13 @@ msgid "All Reports as CSV"
 msgstr "Όλες οι Αναφορές ως CSV"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Όλες οι Αναφορές"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Όλες οι αναφορές"
@@ -380,9 +370,8 @@ msgstr "Ανώνυμος:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Προσθήκη χρήστη"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -394,9 +383,8 @@ msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Είσαι προγραμματιστής;"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -431,9 +419,8 @@ msgid "Assign to subdivision:"
 msgstr "Ανάθεση στο τμήμα:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Ανατέθηκε στο &quot;%s&quot;"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -453,9 +440,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Δημόσια απάντηση:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -476,9 +462,8 @@ msgid "Back"
 msgstr "Πίσω"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "όλες οι αναφορές"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -522,14 +507,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Κατηγορία"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Κατηγορία:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -546,9 +529,8 @@ msgid "Category"
 msgstr "Κατηγορία"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "π.χ. ‘%s’ ή ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -574,9 +556,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Αποκλεισμός της διεύθυνσης email"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -805,14 +786,12 @@ msgid "Create category"
 msgstr "Δημιουργία κατηγορίας"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Δημιουργία αναφοράς"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Δεν αναφέρθηκε σε υπηρεσία"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -880,9 +859,8 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Περιγραφή"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -972,28 +950,24 @@ msgid "Edit body details"
 msgstr "Επεξεργασία λεπτομερειών του τομέα"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Επεξεργασία λεπτομερειών του τομέα"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Δημιουργία κατηγορίας"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Φίλτρο λίστας αναφοράς"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "διορθωμένες αναφορές"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1037,9 +1011,8 @@ msgstr "Το Email προστέθηκε στην μαύρη λίστα"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Ηλεκτρονική διεύθυνση:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1151,9 +1124,8 @@ msgstr "Παραδείγματα:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Δημιουργία κατηγορίας"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1167,23 +1139,20 @@ msgid "Extern"
 msgstr "Εξωτερικός"
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "Εξωτερικός Σύνδεσμος"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "Εξωτερικός Σύνδεσμος"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Εξωτερικός Σύνδεσμος"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Εξωτερικός Σύνδεσμος"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1191,9 +1160,8 @@ msgid "Extra data:"
 msgstr "Επιπλέον δεδομένα:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Επιπλέον δεδομένα:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1473,9 +1441,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Αν υποβάλεις ένα πρόβλημα εδώ, το θέμα και οι λεπτομέρειες του προβλήματος θα είναι δημόσιες, αλλά το πρόβλημα <strong>δεν</strong> θα υποβληθεί στην υπηρεσία."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1562,9 +1529,8 @@ msgid "Incorrect has_photo value \"%s\""
 msgstr "Εσφαλμένη τιμή has_photo \"%s\""
 
 #: templates/web/base/admin/contact-form.html:84
-#, fuzzy
 msgid "Inspection required"
-msgstr "Απαιτείται φωτογραφία"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
@@ -1647,9 +1613,8 @@ msgid "Last&nbsp;update:"
 msgstr "Τελευταία&nbsp;ενημέρωση:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Τελευταία ενημέρωση"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1664,10 +1629,9 @@ msgid "Loading..."
 msgstr "Φορτώνει..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Τοπικές ροές RSS και ειδοποιήσεις email"
@@ -1730,9 +1694,8 @@ msgid "Message to external body:"
 msgstr "Μήνυμα προς τον εξωτερικό τομέα:"
 
 #: templates/web/base/admin/report_edit.html:71
-#, fuzzy
 msgid "Missing bodies:"
-msgstr "%s τομείς"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:446
 msgid "Missing jurisdiction_id"
@@ -1743,14 +1706,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Να περιλαμβάνονται οι προσωπικές πληροφορίες του υποβολέα"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Δημιουργία αναφοράς"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1797,9 +1758,8 @@ msgid "Name: %s"
 msgstr "Όνομα: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Ενημερώσεις για το πρόβλημα, %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1840,9 +1800,8 @@ msgid "New category contact added"
 msgstr "Προστέθηκε νέα επαφή κατηγορίας"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Ηλεκτρονική διεύθυνση:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1858,15 +1817,13 @@ msgid "New note to DM:"
 msgstr "Νέα σημείωση προς τον Διαχειριστή Παροχών Υπηρεσίας:"
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Νέος κωδικός πρόσβασης:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Νέες αναφορές"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1927,9 +1884,8 @@ msgid "No"
 msgstr "Όχι"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "άλλες περιοχές:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1984,14 +1940,10 @@ msgstr "Κανένα"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"Οι κανονικοί (δημόσιοι) χρήστες δεν θα έπρεπε να είναι συσχετισμένοι με οποιοδήποτε <strong>τομέα</strong>.<br>\n"
-"Χρήστες εξουσιοδοτημένου προσωπικού μπορούν να συσχετιστούν με τον τομέα που αντιπροσωπεύουν.<br>\n"
-"Ανάλογα με την υλοποίηση, οι χρήστες προσωπικού ίσως έχουν πρόσβαση στον πίνακα εργαλείων (περίληψη της δραστηριότητάς τους μέσα στον τομέα), τη δυνατότητα να κρύβουν αναφορές ή να ορίζουν ειδικές αναφορές κατάστασης."
 
 #: templates/web/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2119,9 +2071,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API για τον server του mySociety FixMyStreet"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Προδιαγραφές Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2237,9 +2188,8 @@ msgstr "Απαιτείται φωτογραφία"
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Φωτογραφία"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2293,8 +2243,7 @@ msgid "Please choose a property type"
 msgstr "Παρακαλούμε επίλεξε ένα είδος ακινήτου"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Παρακαλούμε διόρθωσε τα παρακάτω λάθη"
 
@@ -2324,9 +2273,8 @@ msgid "Please enter a name"
 msgstr "Παρακαλώ γράψτε ένα όνομα"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Παρακαλώ γράψτε ένα όνομα"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2452,9 +2400,8 @@ msgid "Please note:"
 msgstr "Παρακαλούμε σημείωσε ότι:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2631,9 +2578,8 @@ msgid "Provide an update"
 msgstr "Δώσε μια ενημέρωση"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Δώσε μια ενημέρωση"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2650,9 +2596,8 @@ msgid "Public response:"
 msgstr "Δημόσια απάντηση:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Δημόσια απάντηση:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2754,9 +2699,8 @@ msgid "Recently reported problems"
 msgstr "Πρόσφατες αναφορές προβλημάτων"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Λήψη ενημερώσεων"
+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."
@@ -2791,9 +2735,8 @@ msgid "Report"
 msgstr "Αναφορά"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Αναφορά"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2806,9 +2749,8 @@ msgid "Report abuse"
 msgstr "Αναφορά κατάχρησης"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Αναφορές"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2918,9 +2860,8 @@ msgid "Reports published"
 msgstr "Αναφορές που δημοσιεύθηκαν"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Αναφορές που αναμένουν έγκριση"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2943,24 +2884,20 @@ msgid "Response Priorities"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:1
-#, fuzzy
 msgid "Response Priorities for %s"
-msgstr "Πρότυπα απαντήσεων για %s"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
-#, fuzzy
 msgid "Response Priority for %s"
-msgstr "Πρότυπα απαντήσεων για %s"
+msgstr ""
 
 #: templates/web/base/admin/template_edit.html:1
-#, fuzzy
 msgid "Response Template for %s"
-msgstr "Πρότυπα απαντήσεων για %s"
+msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "Πρότυπα απαντήσεων για %s"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -3028,8 +2965,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Αναζήτηση Αναφορών"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Αναζήτηση Χρηστών"
 
@@ -3075,9 +3011,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr "Διάλεξε ποιο είδος ειδοποίησης θα προτιμούσες και μετά κάνε κλικ στο κουμπί για να οδηγηθείς σε μία ροή RSS, ή γράψε τη διεύθυνση email σου για να ειδοποιείσαι μέσω email."
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Θέμα:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3121,9 +3056,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Δημοσιεύθηκε από %s στις %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3148,9 +3082,8 @@ msgid "Sign in"
 msgstr "Σύνδεση"
 
 #: templates/web/base/auth/general.html:96
-#, fuzzy
 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
-msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισάγοντας έναν νέο κωδικό πρόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός πρόσβασης θα αλλάξει."
+msgstr ""
 
 #: templates/web/base/auth/general.html:1
 #: templates/web/zurich/auth/general.html:1
@@ -3258,8 +3191,7 @@ msgstr "Κατάσταση:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3340,20 +3272,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Γίνε συνδρομητής σε ειδοποιήσεις μέσω email"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλημα"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Υποβολή αλλαγών"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3420,9 +3349,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Ευχαριστούμε που ενημέρωσες αυτό το ζήτημα!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Ευχαριστούμε για την πληροφόρηση"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3652,15 +3580,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Θα χρησιμοποιήσουμε τις προσωπικές σου πληροφορίες μόνο σύμφωνα με την <a href=\"/privacy\">πολιτική απορρήτου.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/privacy\">πολιτική απορρήτου.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3820,9 +3746,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Δημιουργήθηκε:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3959,9 +3884,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Χρησιμοποίησε την <strong>σημείωση</strong> για να καταγράψεις τις λεπτομέρειες που θα φαίνονται στον διαχειριστή. Οι σημειώσεις δεν εμφανίζονται δημόσια και δεν αποστέλλονται στον τομέα."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3987,8 +3911,7 @@ msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσμα
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Χρήστες"
 
@@ -4228,9 +4151,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Δεν έχεις υποβάλλει ακόμα κάποιες αναφορές. <a href=\"%s\">Ανάφερε κάποιο πρόβλημα τώρα.</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Δεν έχεις υποβάλλει ακόμα κάποιες αναφορές. <a href=\"%s\">Ανάφερε κάποιο πρόβλημα τώρα.</a>"
+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."
@@ -4252,9 +4174,8 @@ msgstr "Οι Αναφορές σου"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Επιβεβαίωση λογαριασμού"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4315,9 +4236,8 @@ msgstr "Οι αναφορές σου"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Οι Αναφορές σου"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4325,9 +4245,8 @@ msgstr "Οι ενημερώσεις σου"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Το e-mail σου"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4424,9 +4343,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(προαιρετικό)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4461,9 +4379,8 @@ msgid "reopened"
 msgstr "άνοιξε ξανά"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "required"
-msgstr "Απαιτείται φωτογραφία"
+msgstr ""
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4579,45 +4496,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για το άλλο συμβούλιο που είναι αρμόδια σε αυτήν την τοποθεσία."
 msgstr[1] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για τις υπόλοιπες υπηρεσίες που είναι αρμόδιες για αυτήν την τοποθεσία."
-
-#~ msgid "(public)"
-#~ msgstr "(φαίνεται δημόσια)"
-
-#~ msgid "Additional Information"
-#~ msgstr "Επιπλέον Πληροφορίες"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν στο"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν στο <strong>&quot;%s&quot;</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Ρύθμιση σημείου τερματισμού"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Εξήγησε ποιο είναι το πρόβλημα, που βρίσκεται ακριβώς και για πόσο καιρό υπάρχει..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS στους Χάρτες Google"
-
-#~ msgid "One-line summary"
-#~ msgstr "Περίληψη μιας γραμμής"
-
-#~ msgid "Survey"
-#~ msgstr "Έρευνα"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Η περίληψη και η περιγραφή θα είναι επίσης δημόσιες (δες την <a href=\"/privacy\">πολιτική απορρήτου</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "Δε δείχνουμε ποτέ το email σου"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Δε δείχνουμε ποτέ το email ή το τηλέφωνό σου"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "Ποιο είναι το θέμα και που βρίσκεται;"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Είσαι σίγουρος ότι θέλεις να το ξαναστείλεις;"
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0b8d64bd2..3f5b66e24 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,20 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Francisco Jimenez Asensio <ocm@ocmalcantarilla.es>, 2015
-# jvlopez <jesusvlopez@gmail.com>, 2014
-# lfalvarez <luisfelipealvarez@gmail.com>, 2014
-# mySociety <transifex@mysociety.org>, 2015
-# Pedro Prieto martín <pedro.prieto-martin@ckyosei.org>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Spanish (Spain) (http://www.transifex.com/mysociety/fixmystreet/language/es_ES/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Spanish (Spain) (https://www.transifex.com/mysociety/teams/12067/es_ES/)\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -285,9 +280,8 @@ msgid "Add user"
 msgstr "Añadir un usuario"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Agregar nueva categoría"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -331,15 +325,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Todas las notificaciones"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Todas las notificaciones"
@@ -365,9 +357,8 @@ msgstr "Anónimo:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Añadir un usuario"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -379,9 +370,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "¿Eres programador?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -416,9 +406,8 @@ msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Asignado a %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -438,9 +427,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Respuesta del público:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -461,9 +449,8 @@ msgid "Back"
 msgstr "Atras"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Todas las notificaciones"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -507,14 +494,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Categoría"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Categoría:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -531,9 +516,8 @@ msgid "Category"
 msgstr "Categoría"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "por ejemplo, '%s' o '%s'"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -559,9 +543,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Suspender este email"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -662,9 +645,8 @@ msgid "Closed by council"
 msgstr "Cerrada por el Ayuntamiento"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Vuelva a enviar la notificación"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -795,14 +777,12 @@ msgid "Create category"
 msgstr "Crear una categoría"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Crear una notificación"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "No comunicado al ayuntamiento"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -870,9 +850,8 @@ msgid "Description"
 msgstr "Descripción"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Descripción"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -962,28 +941,24 @@ msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Editar los detalles del órgano administrativo"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Crear una categoría"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtrar lista de informes"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Todas las notificaciones"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1027,9 +1002,8 @@ msgstr "Email añadido a lista de abusones"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Dirección de email:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1141,9 +1115,8 @@ msgstr "Ejemplos:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Crear una categoría"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1157,23 +1130,20 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "URL Externo"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "URL Externo"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "URL Externo"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "URL Externo"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1181,9 +1151,8 @@ msgid "Extra data:"
 msgstr "Datos adicionales:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Datos adicionales:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1225,9 +1194,8 @@ msgid "Fixed - User"
 msgstr "Arreglado - Usuario"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Nuevos informes"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1466,9 +1434,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Si notifica un problema aquí, estará visible en la web, pero <strong>no se enviará</strong> una notificación automática a ningún organismo administrativo."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1645,9 +1612,8 @@ msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Última actualización:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1662,10 +1628,9 @@ msgid "Loading..."
 msgstr "Cargando..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Listados RSS locales y alertas por email"
@@ -1740,14 +1705,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Incluir datos del notificador"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Crear una notificación"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1794,9 +1757,8 @@ msgid "Name: %s"
 msgstr "Nombre: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Listado RSS de actualizaciones sobre este problema"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1837,9 +1799,8 @@ msgid "New category contact added"
 msgstr "Añadida nueva categoría de contactos"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Dirección de email:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1855,15 +1816,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Contraseña:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Nuevos informes"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1924,9 +1883,8 @@ msgid "No"
 msgstr "No"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "otras áreas:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1983,15 +1941,10 @@ msgstr "Nada"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"Normalmente los usuarios (públicos) no deben estar asociados con ningún <strong>organismo</ strong>. <br>\n"
-"El personal autorizado puede ser asociado al organismo administrativo que representan. <br>\n"
-"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/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2120,9 +2073,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "API Open311 para el servidor FixMyStreet de mySociety"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Especificación Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2238,9 +2190,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2294,8 +2245,7 @@ msgid "Please choose a property type"
 msgstr "Por favor, elija un tipo de propiedad"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Por favor, corrija los errores a continuación"
 
@@ -2322,9 +2272,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Por favor, introduzca una contraseña"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2450,9 +2399,8 @@ msgid "Please note:"
 msgstr "Por favor, tenga en cuenta:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Por favor, explique por qué está reabriendo esta notificación."
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2629,9 +2577,8 @@ msgid "Provide an update"
 msgstr "Proporcionar una actualización"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Proporcionar una actualización"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2648,9 +2595,8 @@ msgid "Public response:"
 msgstr "Respuesta del público:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Respuesta del público:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2752,9 +2698,8 @@ msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Recibe actualizaciones"
+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."
@@ -2789,9 +2734,8 @@ msgid "Report"
 msgstr "Notificar"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Notificar"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2804,9 +2748,8 @@ msgid "Report abuse"
 msgstr "Denunciar abuso"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Notificaciones"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2916,9 +2859,8 @@ msgid "Reports published"
 msgstr "Notificaciones publicadas"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Informes en espera de aprobación"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -3022,8 +2964,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Buscar Notificaciones"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Buscar Usuarios"
 
@@ -3069,9 +3010,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Título:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3115,9 +3055,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Publicado por %s - %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3253,8 +3192,7 @@ msgstr "Estado/Prov.:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3335,20 +3273,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Suscríbeme a alertas por email"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Introduzca detalles del problema"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Enviar cambios"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3415,9 +3350,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Gracias por actualizar esta incidencia!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Gracias por su feedback"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3650,15 +3584,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</a>."
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</a>."
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3818,9 +3750,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Creado:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3847,9 +3778,8 @@ msgid "Unconfirmed"
 msgstr "Sin confirmar"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Nuevos informes"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3958,9 +3888,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Usa la <strong>nota</strong> para guardar detalles que sólo serán desplegados en la sección de administración. Las notas no son mostradas públicamente ni son enviadas al órgano administrativo."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3986,8 +3915,7 @@ msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcc
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Usuarios"
 
@@ -4227,9 +4155,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "No ha notificado nada aún. <a href=\"%s\">Notifique un problema ahora</a>."
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "No ha notificado nada aún. <a href=\"%s\">Notifique un problema ahora</a>."
+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."
@@ -4251,9 +4178,8 @@ msgstr "Sus notificaciones"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Confirmar cuenta"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4314,9 +4240,8 @@ msgstr "Sus notificaciones"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Sus notificaciones"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4324,9 +4249,8 @@ msgstr "Sus actualizaciones"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Su email:"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4423,9 +4347,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(opcional)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4577,42 +4500,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
 msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área."
-
-#~ msgid "(public)"
-#~ msgstr "(público)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Toda la información que proporcione será enviada a"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Toda la información que proporcione será enviada al <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Configurar punto"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Explique el problema o incidencia, su localización exacta, cuánto tiempo lleva ahí..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS en Google Maps"
-
-#~ msgid "One-line summary"
-#~ msgstr "Resumen"
-
-#~ msgid "Survey"
-#~ msgstr "Encuesta"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "El resumen y la descripción también se harán públicos (consulte nuestra <a href=\"/privacy\">política de privacidad</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "Nunca mostramos su dirección de email"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Nunca mostramos su dirección de email o número de teléfono."
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "¿Cuál es el problema y dónde está?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "¿De verdad quiere volver a enviar?"
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..2896d3eff
--- /dev/null
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,4515 @@
+# 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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.0\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2016-11-08 11:39+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Robert Lo Bue <rob@applingua.com>, 2017\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n"
+"Language: es_DO\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:639
+#: perllib/FixMyStreet/Script/Reports.pm:199
+msgid " and "
+msgstr " y "
+
+#: templates/web/base/report/new/category_extras.html:13
+#: templates/web/base/report/new/councils_text_all.html:4
+#: templates/web/base/report/new/top_message_none.html:12
+#: templates/web/base/report/new/top_message_none.html:15
+#: templates/web/base/report/new/top_message_some.html:12
+#: templates/web/base/report/new/top_message_some.html:9
+msgid " or "
+msgstr " o "
+
+#: templates/web/base/admin/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%d ediciones por %s"
+
+#: templates/web/base/pagination.html:7
+msgid "%d to %d of %d"
+msgstr "%d a %d de %d"
+
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:24
+msgid "%s - Summary reports"
+msgstr "%s - Informes de notificación"
+
+#. ("%s here is the site name")
+#: templates/web/base/admin/navigation.html:3
+msgid "%s admin:"
+msgstr "%es admin:"
+
+#: templates/web/base/status/stats.html:26
+msgid "%s bodies"
+msgstr "%s organismos administrativos"
+
+#: templates/web/base/status/stats.html:24
+msgid "%s confirmed alerts, %s unconfirmed"
+msgstr "%s alertas confirmadas, %s sin confirmar"
+
+#: 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 contactos en Ayuntamiento &ndash; %s confirmados, %s sin confirmar"
+
+#. ("%s is the site name")
+#: templates/web/base/alert/index.html:7
+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 tiene una variedad de feeds RRS y alertas de email para los problemas locales, que incluyen aquellas para todos los problemas dentro de un barrio en particular, o para todos los problemas dentro de una determinada distancia de un lugar en particular."
+
+#. ("%s is the site name")
+#: templates/web/base/alert/index.html:11
+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 tiene una variedad de listados RRS y alertas de email para los problemas locales, que incluyen \n"
+"aquellas para todos los problemas dentro de un barrio o ayuntamiento en particular, o para todos los problemas\n"
+" dentro de una determinada distancia de un lugar en particular."
+
+#: templates/web/base/status/stats.html:23
+msgid "%s live updates"
+msgstr "%s actualizaciones en vivo"
+
+#: templates/web/base/status/stats.html:25
+msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
+msgstr "%s cuestionarios enviados &ndash; %s respondidos (%s%%)"
+
+#: templates/web/base/report/_council_sent_info.html:8
+msgid "%s ref:&nbsp;%s"
+msgstr "%s ref:&nbsp;%s"
+
+#. ("%s is the site name")
+#: templates/web/base/alert/_list.html:74
+msgid ""
+"%s sends different categories of problem\n"
+"to the appropriate council, so problems within the boundary of a particular council\n"
+"might not match the problems sent to that council. For example, a graffiti report\n"
+"will be sent to the district council, so will appear in both of the district\n"
+"council&rsquo;s alerts, but will only appear in the \"Within the boundary\" alert\n"
+"for the county council."
+msgstr ""
+"%s envía diferentes categorías de problemas\n"
+"al ayuntamiento apropiado, de manera que los problemas dentro de las fronteras de cierto ayuntamiento\n"
+"no podrían coincidir con los problemas enviados a ese ayuntamiento.  Por ejemplo, un reporte de grafiti\n"
+"será enviado al ayuntamiento del distrito, de manera que aparecerá en ambas alertas del distrito\n"
+"council&amp;rsquo;s, pero solo aparecerá en la alerta \"Dentro de la frontera\"\n"
+"para el ayuntamiento del municipio."
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+msgid "%s ward, %s"
+msgstr "%s barrio, %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+msgid "%s, within %s ward"
+msgstr "%s, en %s barrio"
+
+#: perllib/FixMyStreet/Map/OSM.pm:42
+msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
+msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> colaboradores"
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:21
+msgid "(Defect &amp; location of defect)"
+msgstr "(Defecto &amp; ubicación del defecto)"
+
+#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/users.html:32
+msgid "(Email in abuse table)"
+msgstr "(email registrado en la tabla de abusos)"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:62
+#: templates/web/zurich/admin/report_edit.html:90
+msgid "(No name)"
+msgstr "(Sin nombre)"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:69
+#: templates/web/zurich/admin/report_edit.html:97
+msgid "(No phone number)"
+msgstr "(Sin número de teléfono)"
+
+#: templates/web/base/alert/_list.html:25
+msgid "(a default distance which covers roughly 200,000 people)"
+msgstr "(distancia que cubre aproximadamente 200.000 personas)"
+
+#. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
+#: templates/web/base/alert/_list.html:30
+msgid "(alternatively the RSS feed can be customised, within %s)"
+msgstr "(un listado RSS podría ser diseñado alternativamente, dentro de %es)"
+
+#: templates/web/base/report/_item.html:27
+#: templates/web/zurich/report/_item.html:19
+msgid "(closed)"
+msgstr "(cerrado)"
+
+#: templates/web/base/report/_item.html:25
+#: templates/web/zurich/report/_item.html:17
+msgid "(fixed)"
+msgstr "(arreglado)"
+
+#: templates/web/base/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)"
+
+#: templates/web/base/report/_item.html:21
+msgid "(not sent to council)"
+msgstr "(no enviadas al ayuntamiento)"
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
+msgid "(optional)"
+msgstr "(opcional)"
+
+#: templates/web/base/report/_item.html:20
+msgid "(sent to both)"
+msgstr "(enviado a ambos)"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
+#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+msgid "-- Pick a category --"
+msgstr "-- Escoja una categoría --"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+msgid "-- Pick a property type --"
+msgstr "-- Escoja un tipo de propiedad --"
+
+#: templates/web/base/admin/response_templates_select.html:4
+msgid "--Choose a template--"
+msgstr "--Elija una plantilla--"
+
+#: templates/web/base/report/new/form_report.html:23
+msgid "10 inch pothole on Example St, near post box"
+msgstr "Un bache de 25 centímetros en Calle Ejemplo, cerca al buzón de correos"
+
+#: templates/web/base/admin/body-form.html:48
+#: templates/web/base/admin/body-form.html:49
+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 ""
+"Se ha configurado <code>MAPIT_URL</code> (<code>%s</code>) pero no se han configurado <code>MAPIT_TYPES</code>.<br>\n"
+"Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
+"Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
+
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#: templates/web/base/reports/_list-filters.html:28
+msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
+msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
+
+#: templates/web/base/status/stats.html:18
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%s</strong> live problems"
+msgstr "<strong>%s</strong> notificaciones en curso"
+
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:2
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr "<strong>No</strong>- confirmar mi notificación por email"
+
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:2
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr "<strong>No</strong>- confirmar mi actualización por email"
+
+#: templates/web/base/auth/general.html:104
+#: templates/web/zurich/auth/general.html:51
+msgid "<strong>No</strong> let me sign in by email"
+msgstr "<strong>No</strong>- permítanme registrarme por email"
+
+#: templates/web/base/report/_inspect.html:133
+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."
+
+#: templates/web/base/report/_inspect.html:135
+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."
+
+#: templates/web/base/auth/general.html:80
+#: templates/web/base/report/new/form_user_loggedout_password.html:3
+#: templates/web/base/report/update/form_user_loggedout_password.html:2
+msgid "<strong>Yes</strong> I have a password"
+msgstr "<strong>Sí</strong>- tengo una contraseña"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:42
+msgid "Action Scheduled"
+msgstr "Acción programada"
+
+#: templates/web/base/admin/body-form.html:3
+#: templates/web/base/admin/body-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 ""
+"Agregue un <strong>órgano</strong> para cada órgano administrativo, por ejemplo una municipalidad o departamento\n"
+"al que se puede enviar las notificaciones. Puedes asignar uno o más contactos a cada\n"
+"órgano para las diferentes categorías de problemas."
+
+#: templates/web/base/admin/body.html:60
+msgid "Add a contact using the form below."
+msgstr "Añada un contacto usando el siguiente formulario."
+
+#: templates/web/base/admin/bodies.html:78
+#: templates/web/base/admin/body-form.html:138
+#: templates/web/zurich/admin/body-form.html:52
+msgid "Add body"
+msgstr "Agregue un órgano"
+
+#: templates/web/base/admin/body.html:126
+#: templates/web/zurich/admin/body.html:31
+msgid "Add new category"
+msgstr "Agregar nueva categoría"
+
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:19
+#: templates/web/base/report/_main.html:27
+msgid "Add to shortlist"
+msgstr "Añadir a la lista de pre-seleccionados"
+
+#: templates/web/base/admin/user_edit.html:4
+#: templates/web/base/admin/users.html:48
+msgid "Add user"
+msgstr "Añadir un usuario"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
+msgid "Add/edit problem categories"
+msgstr "Añadir/editar las categorias del problema"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
+msgid "Add/edit response priorities"
+msgstr "Añadir/Editar las prioridades de respuesta"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
+msgid "Add/edit response templates"
+msgstr "Añadir/Editar las plantillas de respuesta"
+
+#: templates/web/base/my/my.html:67
+msgid "Added %s"
+msgstr "Añadido %s"
+
+#: templates/web/base/report/_main.html:141
+msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
+msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados."
+
+#: templates/web/base/auth/change_password.html:39
+msgid "Again:"
+msgstr "Otra vez:"
+
+#: templates/web/base/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s"
+
+#: templates/web/base/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr "Alerta %d desactivada (creada %s)"
+
+#: templates/web/base/report/update/form_name.html:38
+msgid "Alert me to future updates"
+msgstr "Notificadme actualizaciones futuras"
+
+#: templates/web/base/reports/index.html:6
+#: templates/web/zurich/reports/index.html:13
+msgid "All Reports"
+msgstr "Todas las notificaciones"
+
+#: templates/web/zurich/admin/stats.html:5
+msgid "All Reports as CSV"
+msgstr "Todos los informes como CSV"
+
+#: templates/web/base/admin/responsepriorities/list.html:19
+msgid "All categories"
+msgstr "Todas las categorías"
+
+#: templates/web/base/footer.html:29
+#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr "Todas las notificaciones"
+
+#: templates/web/base/admin/stats.html:5
+#: templates/web/zurich/admin/stats.html:8
+msgid "All reports between %s and %s"
+msgstr "Todas las notificaciones entre %s y %s"
+
+#: templates/web/base/questionnaire/index.html:47
+msgid "An update marked this problem as fixed."
+msgstr "Una actualización marcó este problema como arreglado."
+
+#: templates/web/base/admin/list_updates.html:32
+#: templates/web/base/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr "Anónimo"
+
+#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/update_edit.html:23
+msgid "Anonymous:"
+msgstr "Anónimo:"
+
+#: templates/web/base/report/new/form_user_loggedin.html:20
+#: templates/web/base/report/update/form_name.html:13
+msgid "Another user"
+msgstr "Otro usuario"
+
+#: templates/web/base/front/footer-marketing.html:16
+msgid "Are you a developer?"
+msgstr "¿Es usted programador(a)?"
+
+#: templates/web/base/js/translation_strings.html:53
+msgid "Are you sure you want to cancel this upload?"
+msgstr "¿Está seguro(a) que quiere cancelar esta carga?"
+
+#: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/report/display_tools.html:6
+msgid "Are you sure?"
+msgstr "¿Está seguro(a)?"
+
+#: templates/web/base/admin/body-form.html:75
+#: templates/web/base/admin/body.html:20
+#: templates/web/zurich/admin/body-form.html:24
+msgid "Area covered"
+msgstr "Área cubierta"
+
+#: templates/web/base/admin/user-form.html:64
+msgid "Area:"
+msgstr "Área:"
+
+#: templates/web/base/admin/bodies.html:19
+#: templates/web/base/admin/body.html:64
+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 "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/zurich/admin/report_edit.html:209
+msgid "Assign to competent body:"
+msgstr "Asignar al organismo administrativo competente:"
+
+#: templates/web/zurich/admin/report_edit.html:169
+#: templates/web/zurich/admin/stats.html:36
+msgid "Assign to different category:"
+msgstr "Asignar a otra categoria:"
+
+#: templates/web/zurich/admin/report_edit.html:207
+msgid "Assign to external body:"
+msgstr "Asignar a un órgano externo:"
+
+#: templates/web/zurich/admin/report_edit.html:186
+msgid "Assign to subdivision:"
+msgstr "Asigne a la subdivisión:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
+msgid "Assign users to areas"
+msgstr "Asignar usuarios a las áreas"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:214
+msgid "Assigned to %s"
+msgstr "Asignado 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 "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes se ordenan de acuerdo a la fecha de comienzo, así que para obtener todas las solicitudes es necesario hacer varias solicitudes ajustando la fecha de comienzo y final."
+
+#: templates/web/base/open311/index.html:68
+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/user-form.html:78
+#: templates/web/base/admin/user-form.html:79
+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."
+
+#: templates/web/base/admin/template_edit.html:22
+msgid "Auto-response:"
+msgstr "Respuesta automática:"
+
+#: templates/web/base/admin/report_edit.html:133
+#: templates/web/base/report/_inspect.html:42
+msgid "Available categories"
+msgstr "Categorías disponibles"
+
+#: templates/web/base/report/new/after_photo.html:6
+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:401
+#: templates/web/zurich/report/_item.html:9
+msgid "Awaiting moderation"
+msgstr "En espera de revisión"
+
+#: templates/web/base/js/translation_strings.html:31
+msgid "Back"
+msgstr "Atras"
+
+#: templates/web/base/report/_main.html:6
+msgid "Back to all reports"
+msgstr "Volver a todos los informes"
+
+#: templates/web/base/admin/report_blocks.html:41
+msgid "Ban email address"
+msgstr "Suspender este email"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:650
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:391
+#: templates/web/base/admin/bodies.html:1
+#: templates/web/base/admin/report_edit.html:55
+#: templates/web/zurich/header.html:56
+msgid "Bodies"
+msgstr "Órganos administrativos"
+
+#: templates/web/base/admin/flagged.html:17
+#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/reports.html:15
+#: templates/web/base/admin/users.html:18
+msgid "Body"
+msgstr "Órgano administrativo"
+
+#: templates/web/base/admin/user-form.html:36
+msgid "Body:"
+msgstr "Órgano administrativo:"
+
+#: templates/web/base/admin/stats.html:87
+msgid "By Date"
+msgstr "Por Fecha"
+
+#: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
+msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
+msgstr "¿No puede&rsquo;t encontrar nuestro email? Busque en su folder de email basura&nbsp;&ndash; esa&rsquo;s la solución 99% del tiempo."
+
+#: templates/web/base/around/_report_banner.html:5
+msgid "Can't see the map? <em>Skip this step</em>"
+msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>"
+
+#: templates/web/base/report/_inspect.html:141
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:650
+#: templates/web/base/admin/responsepriorities/list.html:8
+msgid "Categories"
+msgstr "Categorías"
+
+#: templates/web/base/admin/category-checkboxes.html:2
+msgid "Categories:"
+msgstr "Categorías:"
+
+#: templates/web/base/admin/body.html:72
+#: templates/web/base/admin/contact-form.html:19
+#: templates/web/base/admin/stats_fix_rate.html:4
+#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/new/category.html:6
+#: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/body.html:14
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/stats.html:50
+msgid "Category"
+msgstr "Categoría"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+msgid "Category changed from ‘%s’ to ‘%s’"
+msgstr "Categoría cambiada de ‘%s’ a ‘%s’"
+
+#: templates/web/base/admin/stats.html:58
+#: templates/web/base/admin/stats_fix_rate.html:1
+msgid "Category fix rate for problems > 4 weeks old"
+msgstr "Ratio de arreglo de problemas > 4 semanas"
+
+#: templates/web/base/admin/report_edit.html:125
+#: templates/web/zurich/admin/body.html:43
+#: templates/web/zurich/admin/contact-form.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:72
+#: templates/web/zurich/admin/report_edit.html:100
+msgid "Category:"
+msgstr "Categoría:"
+
+#: perllib/FixMyStreet/Script/Reports.pm:190
+msgid "Category: %s"
+msgstr "Categoría: %s"
+
+#: templates/web/base/my/my.html:24
+msgid "Change email"
+msgstr "Cambiar email"
+
+#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:3
+#: templates/web/base/auth/change_email.html:30
+msgid "Change email address"
+msgstr "Cambiar dirección de email"
+
+#: templates/web/base/auth/change_password.html:1
+#: templates/web/base/auth/change_password.html:16
+#: templates/web/base/auth/change_password.html:4
+#: templates/web/base/auth/change_password.html:43
+#: templates/web/base/my/my.html:23
+msgid "Change password"
+msgstr "Cambiar contraseña"
+
+#: templates/web/base/admin/contact-form.html:41
+msgid ""
+"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
+"                If you are not sure of the origin or validity of the contact, leave this unchecked."
+msgstr ""
+"Marcar <strong>confirmado</ strong> para indicar que este contacto se ha confirmado como correcto.\n"
+"Si no está seguro del origen o la validez del contacto, deje esta casilla sin marcar."
+
+#: templates/web/base/admin/contact-form.html:52
+msgid ""
+"Check <strong>deleted</strong> to remove the category from use. \n"
+"        It will not appear as an available category in the drop-down menu on the report-a-problem page."
+msgstr ""
+"Marcar <strong>borrado</ strong> para dejar de usar la categoría. \n"
+"Dejará de aparecer en el menú desplegable que se muestra al notificar los problemas."
+
+#: templates/web/base/admin/contact-form.html:79
+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."
+
+#: templates/web/base/admin/contact-form.html:63
+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"
+
+#: templates/web/base/admin/contact-form.html:11
+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 ""
+"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/admin/stats.html:72
+#: templates/web/base/admin/stats.html:78
+msgid "Click here or enter as dd/mm/yyyy"
+msgstr "Haga click aqui o introduzca dd/mm/yyyy"
+
+#: templates/web/base/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr "Haga clic en el mapa para notificar un problema"
+
+#: templates/web/base/email_sent.html:13
+msgid "Click the link in our confirmation email to activate your alert."
+msgstr "Haga un click en nuestro email de confirmación para activar su alerta."
+
+#: templates/web/base/email_sent.html:9
+msgid "Click the link in our confirmation email to publish your problem."
+msgstr "Haga un click en nuestro email de confirmación para publicar su problema."
+
+#: templates/web/base/email_sent.html:11
+msgid "Click the link in our confirmation email to publish your update."
+msgstr "Haga un click en nuestro email de confirmación para publicar su actualización."
+
+#: templates/web/base/auth/token.html:18
+msgid "Click the link in our confirmation email to sign in."
+msgstr "Haga un click en nuestro email de confirmación para iniciar sesión."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:960
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/banner.html:15
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:10
+#: templates/web/zurich/admin/header.html:16
+#: templates/web/zurich/admin/stats.html:31
+msgid "Closed"
+msgstr "Cerrada"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+msgid "Closed by council"
+msgstr "Cerrada por el Ayuntamiento"
+
+#: templates/web/base/reports/_list-filters.html:4
+msgid "Closed reports"
+msgstr "Informes cerrados"
+
+#: templates/web/base/admin/problem_row.html:38
+msgid "Closed:"
+msgstr "Cerrada:"
+
+#: templates/web/base/admin/report_edit.html:37
+msgid "Co-ordinates:"
+msgstr "Coordenadas:"
+
+#: templates/web/base/admin/list_updates.html:10
+msgid "Cobrand"
+msgstr "Cobrand"
+
+#: templates/web/base/admin/report_edit.html:92
+#: templates/web/base/admin/update_edit.html:52
+msgid "Cobrand data:"
+msgstr "Datos cobrand:"
+
+#: templates/web/base/admin/report_edit.html:91
+#: templates/web/base/admin/update_edit.html:51
+msgid "Cobrand:"
+msgstr "Cobrand:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:646
+#: templates/web/base/admin/config_page.html:1
+msgid "Configuration"
+msgstr "Configuración"
+
+#: templates/web/base/admin/body.html:77
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: templates/web/base/auth/token.html:1
+msgid "Confirm account"
+msgstr "Confirmar cuenta"
+
+#: templates/web/base/report/new/form_user_loggedout_password.html:21
+#: templates/web/base/report/update/form_user_loggedout_password.html:20
+msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
+msgstr "Como alternativa confirme por email, para lo cual tendrá que indicar una nueva contraseña.  Cuando lo confirme, su contraseña será actualizada."
+
+#: 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 "Confirmación"
+
+#: templates/web/base/admin/body.html:85
+#: templates/web/base/admin/category_edit.html:54
+#: templates/web/base/admin/contact-form.html:47
+#: templates/web/zurich/admin/stats.html:40
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#: templates/web/base/admin/stats.html:5
+msgid "Confirmed reports between %s and %s"
+msgstr "Notificaciones confirmadas entre %s y %s"
+
+#: templates/web/base/admin/list_updates.html:39
+#: templates/web/base/admin/problem_row.html:36
+#: templates/web/base/admin/report_edit.html:78
+msgid "Confirmed:"
+msgstr "Confirmada:"
+
+#. ("%s is the site name")
+#: templates/web/base/about/_sidebar.html:6
+msgid "Contact %s"
+msgstr "Contactar %s"
+
+#: templates/web/base/contact/index.html:1
+#: templates/web/base/contact/index.html:2
+#: templates/web/base/contact/submit.html:1
+msgid "Contact Us"
+msgstr "Contáctenos"
+
+#: templates/web/base/contact/index.html:12
+msgid "Contact the team"
+msgstr "Contactar con el equipo"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:42
+#: templates/web/zurich/admin/report_edit.html:61
+msgid "Coordinates:"
+msgstr "Coordenadas:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+msgid "Could not find user"
+msgstr "No se pudo encontrar el usuario"
+
+#: templates/web/base/js/translation_strings.html:36
+msgid "Could not look up location"
+msgstr "No se pudo consultar la ubicación"
+
+#: templates/web/base/admin/list_updates.html:9
+msgid "Council"
+msgstr "Ayuntamiento"
+
+#: templates/web/base/admin/body.html:1
+#: templates/web/base/admin/category_edit.html:1
+#: templates/web/zurich/admin/body.html:1
+msgid "Council contacts for %s"
+msgstr "Contactos del ayuntamiento para %s"
+
+#: templates/web/base/report/_council_sent_info.html:6
+msgid "Council ref:&nbsp;%s"
+msgstr "Referencia del ayuntamiento:&nbsp;%s"
+
+#: templates/web/base/admin/stats.html:92
+msgid "Council:"
+msgstr "Ayuntamiento:"
+
+#: templates/web/base/admin/stats.html:12
+#: templates/web/base/admin/stats.html:32
+#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats.html:50
+msgid "Count"
+msgstr "Total"
+
+#: templates/web/base/email_sent.html:1
+msgid "Create a report"
+msgstr "Crear una notificación"
+
+#: templates/web/base/admin/contact-form.html:137
+#: templates/web/zurich/admin/body.html:62
+msgid "Create category"
+msgstr "Crear una categoría"
+
+#: templates/web/base/admin/responsepriorities/edit.html:36
+msgid "Create priority"
+msgstr "Crear prioridad"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
+msgid "Create reports/updates as the council"
+msgstr "Crear informes/actualizaciones como ayuntamiento"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+msgid "Create reports/updates on a user's behalf"
+msgstr "Crear informes/actualizaciones en nombre del usuario"
+
+#: templates/web/base/admin/template_edit.html:36
+#: templates/web/zurich/admin/template_edit.html:29
+msgid "Create template"
+msgstr "Crear plantillas"
+
+#: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/admin/templates.html:12
+msgid "Created"
+msgstr "Creado"
+
+#: templates/web/base/admin/list_updates.html:38
+#: templates/web/base/admin/report_edit.html:77
+#: templates/web/base/admin/update_edit.html:53
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr "Creado:"
+
+#: templates/web/base/admin/stats.html:31
+msgid "Current state"
+msgstr "Estado actual"
+
+#: templates/web/base/admin/bodies.html:9
+#: templates/web/base/admin/index.html:17
+msgid "Currently no bodies have been created."
+msgstr "No se han creado organismos aún."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:825
+#: templates/web/zurich/admin/report_edit-sdm.html:105
+msgid "Customer not contactable"
+msgstr "Cliente imposible de contactar"
+
+#: templates/web/base/dashboard/index.html:5
+#: templates/web/base/dashboard/index.html:7
+msgid "Dashboard"
+msgstr "Cuadro de mando"
+
+#: templates/web/zurich/admin/stats.html:35
+msgid "Dealt with by subdivision within 5 working days"
+msgstr "Tratado por el departamento dentro de los 5 días hábiles"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/zurich/admin/template_edit.html:33
+msgid "Delete template"
+msgstr "Eliminar plantilla"
+
+#: templates/web/base/admin/bodies.html:31
+#: templates/web/base/admin/body.html:87
+#: templates/web/base/admin/category_edit.html:55
+#: templates/web/base/admin/contact-form.html:58
+#: templates/web/zurich/admin/contact-form.html:12
+msgid "Deleted"
+msgstr "Eliminado"
+
+#: templates/web/base/admin/responsepriorities/list.html:7
+#: templates/web/zurich/admin/index-dm.html:22
+#: templates/web/zurich/admin/index-sdm.html:20
+#: templates/web/zurich/admin/reports.html:12
+msgid "Description"
+msgstr "Descripción"
+
+#: templates/web/base/admin/responsepriorities/edit.html:17
+msgid "Description:"
+msgstr "Descripción:"
+
+#: templates/web/base/js/translation_strings.html:33
+#: templates/web/zurich/report/new/fill_in_details_form.html:45
+msgid "Details"
+msgstr "Detalles"
+
+#: templates/web/base/admin/report_edit.html:112
+#: templates/web/zurich/admin/report_edit-sdm.html:29
+#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:45
+msgid "Details:"
+msgstr "Detalles:"
+
+#: templates/web/base/admin/body.html:93
+msgid "Devolved"
+msgstr "Transferido"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:52
+#: templates/web/zurich/admin/report_edit.html:71
+msgid "Didn't use map"
+msgstr "No usó el mapa"
+
+#: templates/web/base/admin/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr "Ranking de premios a la constancia"
+
+#: templates/web/base/admin/open311-form-fields.html:95
+msgid "Do not send email alerts on fetched comments to problem creator"
+msgstr "No enviar alertas por email en los comentarios recopilados para el creador del problema"
+
+#. ("%s is the site name")
+#: templates/web/base/auth/general.html:58
+#: templates/web/base/report/new/form_user_loggedout.html:25
+#: templates/web/base/report/new/oauth_email_form.html:18
+#: templates/web/base/report/update-form.html:30
+#: templates/web/base/report/update/form_user_loggedout.html:27
+msgid "Do you have a %s password?"
+msgstr "¿Tiene una contraseña %s?"
+
+#: templates/web/base/questionnaire/index.html:57
+msgid "Don&rsquo;t know"
+msgstr "No lo sé"
+
+#: templates/web/base/contact/index.html:110
+msgid "Don't like forms?"
+msgstr "¿No te gustan los formularios?"
+
+#: templates/web/base/js/translation_strings.html:52
+msgid "Drag and drop photos here or <u>click to upload</u>"
+msgstr "Deslice y deje las fotos aquí o <u>haga click para subir</u>"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:43
+msgid "Duplicate"
+msgstr "Duplicado"
+
+#: templates/web/base/admin/body.html:116
+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 ""
+"Cada categoría de problema tiene asignado un contacto (email) en el órgano administrativo.\n"
+"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/_inspect.html:16
+msgid "Easting/Northing:"
+msgstr "Falso este/Falso norte:"
+
+#: templates/web/base/admin/list_updates.html:42
+#: templates/web/base/admin/problem_row.html:41
+#: templates/web/base/admin/responsepriorities/list.html:26
+#: templates/web/base/admin/templates.html:22
+#: templates/web/base/admin/users.html:34
+#: templates/web/zurich/admin/problem_row.html:48
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/web/base/admin/body.html:140
+#: templates/web/base/admin/index.html:35
+#: templates/web/zurich/admin/body.html:69
+msgid "Edit body details"
+msgstr "Editar los detalles del órgano administrativo"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
+msgid "Edit other users' details"
+msgstr "Editar los detalles de otros usuarios"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
+msgid "Edit other users' permissions"
+msgstr "Editar los permisos de otros usuarios"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+msgid "Edit report category"
+msgstr "Editar la categoría del informe"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
+msgid "Edit report priority"
+msgstr "Editar la prioridad del informe"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
+msgid "Edit reports"
+msgstr "Editar los informes"
+
+#: templates/web/base/admin/report_edit.html:0
+#: templates/web/base/admin/report_edit.html:14
+#: templates/web/base/admin/report_edit.html:4
+#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:5
+#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:5
+msgid "Editing problem %d"
+msgstr "Editando el problema %d"
+
+#: templates/web/base/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr "Editando la actualización %d"
+
+#: templates/web/base/admin/user_edit.html:2
+msgid "Editing user %d"
+msgstr "Editando el usuario %d"
+
+#: templates/web/base/admin/category_edit.html:56
+msgid "Editor"
+msgstr "Editor"
+
+#: templates/web/base/admin/bodies.html:27
+#: templates/web/base/admin/category_edit.html:53
+#: templates/web/base/admin/flagged.html:38
+#: templates/web/base/admin/users.html:17
+#: templates/web/base/auth/general.html:49
+#: templates/web/zurich/admin/body-form.html:9
+#: templates/web/zurich/admin/body.html:15
+#: templates/web/zurich/auth/general.html:24
+#: templates/web/zurich/auth/general.html:54
+msgid "Email"
+msgstr "Email:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+msgid "Email added to abuse list"
+msgstr "Email añadido a lista de abusones"
+
+#: templates/web/base/admin/contact-form.html:36
+#: templates/web/base/report/new/form_user_loggedin.html:28
+#: templates/web/base/report/update/form_name.html:19
+msgid "Email address"
+msgstr "Dirección de email"
+
+#: templates/web/base/tokens/confirm_alert.html:6
+msgid "Email alert created"
+msgstr "Creada alerta de email"
+
+#: templates/web/base/tokens/confirm_alert.html:10
+msgid "Email alert deleted"
+msgstr "Borrada alerta de email"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+msgid "Email already in abuse list"
+msgstr "Email ya incluido en la lista de abusones"
+
+#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/update_edit.html:35
+#: templates/web/base/admin/user-form.html:19
+#: templates/web/zurich/admin/body.html:48
+#: templates/web/zurich/admin/contact-form.html:6
+msgid "Email:"
+msgstr "Email:"
+
+#: perllib/FixMyStreet/Script/Reports.pm:112
+msgid "Email: %s"
+msgstr "Email: %s"
+
+#: templates/web/base/admin/open311-form-fields.html:55
+#: templates/web/base/admin/open311-form-fields.html:56
+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 ""
+"Activar <strong>Open311 envío de actualizaciones</strong> si el organismo enviará y recibirá\n"
+"actualizaciones de las notificaciones existentes. Si no está seguro, mejor no lo active.\n"
+"Para obtener más información, consulte\n"
+"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este documento</a>."
+
+#: templates/web/base/admin/body-form.html:120
+#: templates/web/base/admin/body-form.html:121
+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 ""
+"Activar <strong>puede ser transferido</ strong> para establecer si uno o más contactos del órgano administrativo\n"
+"tienen diferentes vías para recibir (y enviar) actualizaciones. Por ejemplo, si los informes para algunas categorías de \n"
+"incidencia deben ser enviadas por correo electrónico, mientras que otros pueden ser enviados a través Open311."
+
+#: templates/web/base/admin/stats.html:77
+msgid "End Date:"
+msgstr "Fecha final:"
+
+#: templates/web/base/admin/open311-form-fields.html:21
+msgid "Endpoint"
+msgstr "Punto final"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:76
+msgid "Enter a Z&uuml;rich street name"
+msgstr "Introduzca un nombre de calle de Z&uuml;rich"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:14
+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"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
+msgid "Enter a nearby postcode, or street name and area"
+msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área"
+
+#: templates/web/base/around/postcode_form.html:5
+#: templates/web/base/around/postcode_form.html:6
+msgid "Enter a nearby street name and area"
+msgstr "Introduzca el nombre de una calle cercana"
+
+#: templates/web/base/auth/general.html:116
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:35
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
+#: templates/web/zurich/auth/general.html:65
+msgid "Enter a password"
+msgstr "Introduzca una contraseña"
+
+#: templates/web/base/index-steps.html:6
+msgid "Enter details of the problem"
+msgstr "Introduzca detalles del problema"
+
+#: templates/web/base/errors/generic.html:1
+#: templates/web/base/errors/generic.html:4
+#: 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 "Error"
+
+#: templates/web/base/reports/_list-filters.html:11
+#: templates/web/base/reports/_list-filters.html:19
+msgid "Everything"
+msgstr "Todo"
+
+#: templates/web/base/admin/body.html:18
+#: templates/web/base/admin/category_edit.html:18
+msgid "Example postcode %s"
+msgstr "Ejemplo de código postal %s"
+
+#: templates/web/base/open311/index.html:86
+msgid "Examples:"
+msgstr "Ejemplos:"
+
+#: templates/web/base/admin/report_edit.html:128
+#: templates/web/base/report/_inspect.html:37
+msgid "Existing category"
+msgstr "Categoría existente"
+
+#: templates/web/base/report/new/form_report.html:52
+msgid "Explain what’s wrong"
+msgstr "Explicar el problema"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:174
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:913
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:12
+msgid "Extern"
+msgstr "Externo"
+
+#: templates/web/base/admin/report_edit.html:97
+msgid "External ID"
+msgstr "ID externo"
+
+#: templates/web/base/admin/body-form.html:87
+msgid "External URL"
+msgstr "URL Externo"
+
+#: templates/web/base/admin/report_edit.html:99
+msgid "External body"
+msgstr "Organismo administrativo externo"
+
+#: templates/web/base/admin/report_edit.html:101
+msgid "External team"
+msgstr "Equipo externo"
+
+#: templates/web/base/admin/category_edit.html:25
+#: templates/web/base/admin/report_edit.html:94
+msgid "Extra data:"
+msgstr "Datos adicionales:"
+
+#: templates/web/base/report/_inspect.html:107
+msgid "Extra details"
+msgstr "Detalles adicionales"
+
+#: templates/web/base/contact/submit.html:13
+msgid "Failed to send message"
+msgstr "Fallo en el envío del mensaje"
+
+#: templates/web/zurich/admin/index-dm.html:33
+#: templates/web/zurich/admin/index-sdm.html:30
+msgid "Filter report list"
+msgstr "Filtrar lista de informes"
+
+#: templates/web/base/questionnaire/index.html:66
+msgid "First time"
+msgstr "Primera vez"
+
+#: templates/web/base/admin/body.html:52
+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."
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:24
+#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/stats_fix_rate.html:4
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/banner.html:12
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:45
+msgid "Fixed"
+msgstr "Arreglado"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:11
+msgid "Fixed - Council"
+msgstr "Arreglado - Ayuntamiento"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:10
+msgid "Fixed - User"
+msgstr "Arreglado - Usuario"
+
+#: templates/web/base/reports/_list-filters.html:5
+msgid "Fixed reports"
+msgstr "Informes arreglados"
+
+#: templates/web/base/admin/problem_row.html:37
+msgid "Fixed:"
+msgstr "Arreglado:"
+
+#: templates/web/base/admin/body-form.html:95
+#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/zurich/admin/body-form.html:36
+msgid "Flag as deleted"
+msgstr "Marcar como borrado"
+
+#: templates/web/base/admin/report_blocks.html:46
+msgid "Flag user"
+msgstr "Marca usuario"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:645
+#: templates/web/base/admin/users.html:20
+msgid "Flagged"
+msgstr "Marcado"
+
+#: templates/web/base/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr "Señalizar informes y usuarios"
+
+#: templates/web/base/admin/user-form.html:94
+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>"
+
+#: 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 "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/report_edit.html:153
+#: templates/web/base/admin/user-form.html:100
+msgid "Flagged:"
+msgstr "Marcado:"
+
+#: templates/web/base/reports/_ward-list.html:4
+msgid "Follow a ward link to view only reports within that ward."
+msgstr "Haga clic en el enlace de un barrio para ver solo sus notificaciones."
+
+#: templates/web/base/report/new/after_photo.html:3
+msgid "For best results include a close-up and a wide shot"
+msgstr "Para mejores resultados incluya una toma en close-up y una abierta"
+
+#: templates/web/base/admin/body-form.html:71
+msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr "Para más información, vea <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>."
+
+#: templates/web/base/auth/general.html:95
+#: templates/web/base/report/new/form_user_loggedout_password.html:20
+#: templates/web/base/report/update/form_user_loggedout_password.html:19
+msgid "Forgotten your password?"
+msgstr "¿Olvidó su contraseña?"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:743
+msgid "Forwarded to external body"
+msgstr "Reenviado al organismo administrativo externo"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:744
+msgid "Forwarded wish to external body"
+msgstr "Deseo reenviado al organismo administrativo 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
+msgid "Frequently Asked Questions"
+msgstr "Listado de Preguntas Frecuentes"
+
+#: templates/web/base/around/_updates.html:3
+#: templates/web/base/report/display_tools.html:12
+msgid "Get updates"
+msgstr "Recibe actualizaciones"
+
+#: templates/web/base/reports/_rss.html:3
+#: templates/web/base/reports/_rss.html:9
+msgid "Get updates of %s problems"
+msgstr "Recibe actualizaciones de los problemas %s"
+
+#: templates/web/base/reports/_rss.html:11
+#: templates/web/base/reports/_rss.html:3
+msgid "Get updates of problems in this %s"
+msgstr "Recibe actualizaciones de los problemas en este %s"
+
+#: templates/web/base/alert/_list.html:83
+msgid "Give me an RSS feed"
+msgstr "Proporcióname un listado RSS"
+
+#: templates/web/base/questionnaire/completed.html:14
+msgid "Glad to hear it’s been fixed!"
+msgstr "¡Nos alegra saber que ha sido arreglado!"
+
+#: templates/web/base/admin/index.html:45
+#: templates/web/base/alert/index.html:34
+#: templates/web/base/around/postcode_form.html:13
+#: templates/web/base/reports/_list-filters.html:29
+#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/zurich/admin/stats.html:26
+msgid "Go"
+msgstr "Ir"
+
+#: templates/web/base/admin/report_edit.html:95
+msgid "Going to send questionnaire?"
+msgstr "¿Va a enviar cuestionario?"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
+msgid "Grant access to the admin"
+msgstr "Permitir el acceso al administrador"
+
+#: templates/web/base/admin/index.html:70
+msgid "Graph of problem creation by status over time"
+msgstr "Gráfico temporal de creación problemas por estado"
+
+#: templates/web/base/reports/index.html:15
+msgid "Greyed-out lines are councils that no longer exist."
+msgstr "Las líneas de color gris corresponden a áreas de organismos que ya no existen."
+
+#: templates/web/base/questionnaire/index.html:48
+msgid "Has this problem been fixed?"
+msgstr "¿Ha sido corregido este problema?"
+
+#: templates/web/base/questionnaire/index.html:61
+msgid "Have you ever reported a problem to a council before, or is this your first time?"
+msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?"
+
+#: templates/web/base/footer.html:35
+#: templates/web/zurich/about/faq-de-ch.html:1
+#: templates/web/zurich/footer.html:23
+#: templates/web/zurich/nav_over_content.html:8
+msgid "Help"
+msgstr "Ayuda"
+
+#: templates/web/base/report/new/category_extras.html:13
+#: templates/web/base/report/new/category_extras.html:14
+msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
+msgstr "Ayuda <strong>%s</strong>para resolver su problema más rápido, indique detalles adicionales.  Esta información adicional no será publicada online."
+
+#: templates/web/base/alert/_list.html:9
+msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
+msgstr "Estos son los tipos de notificaciones de incidencias locales para '%s'."
+
+#: templates/web/zurich/footer.html:12
+msgid "Hi %s"
+msgstr "%s"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:906
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr "Oculto"
+
+#: templates/web/base/around/display_location.html:67
+msgid "Hide old"
+msgstr "Ocultar antiguos"
+
+#: templates/web/base/around/display_location.html:62
+msgid "Hide pins"
+msgstr "Ocultar marcadores"
+
+#: templates/web/base/admin/category_edit.html:49
+msgid "History"
+msgstr "Historial"
+
+#: templates/web/base/around/display_location.html:75
+msgid "Home"
+msgstr "Inicio"
+
+#: templates/web/base/index-steps.html:1
+msgid "How to report a problem"
+msgstr "Cómo notificar un problema"
+
+#: templates/web/base/js/translation_strings.html:32
+msgid "How to send successful reports"
+msgstr "¿Cómo enviar informes exitosos?"
+
+#: templates/web/base/tokens/confirm_problem.html:36
+#: templates/web/base/tokens/confirm_problem.html:40
+msgid "I just reported a problem on @fixmystreet"
+msgstr "Acabo de informar de un problema en @fixmystreet"
+
+#: templates/web/base/tokens/confirm_update.html:19
+#: templates/web/base/tokens/confirm_update.html:23
+msgid "I just updated a problem on @fixmystreet"
+msgstr "Acabo de actualizar un problema en @fixmystreet"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr "No se ha podido localizar su problema en la base de datos.\n"
+
+#: templates/web/base/admin/flagged.html:14
+#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/list_updates.html:6
+#: templates/web/base/admin/reports.html:12
+#: templates/web/zurich/admin/index-dm.html:21
+#: 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.html:11
+msgid "ID"
+msgstr "ID"
+
+#: templates/web/base/admin/body-form.html:30
+#: templates/web/base/admin/body-form.html:31
+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 ""
+"Identificar una <strong>sub-organismos</ strong> si este organismo forma parte de otro organismo.\n"
+"Para las instalaciones básicas, no necesita asociar los organismos de esta manera."
+
+#: templates/web/base/admin/contact-form.html:14
+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 ""
+"Si dos o más organismos tienen la misma ubicación, FixMyStreet combina categorías de notificaciones idénticas en una sola entrada en\n"
+"el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas."
+
+#: 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 "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización."
+
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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 "Si quiere que esta prioridad sea una opción para categorías específicas, elíjalas aquí.  Como valor predeterminado se mostrarán todas las categorías."
+
+#: templates/web/base/admin/template_edit.html:29
+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 "Si quiere que esta plantilla sea una opción para categorías específicas, elíjalas aquí.  Como valor predeterminado se mostrará para todas las categorías."
+
+#: templates/web/base/report/new/top_message_none.html:10
+#: templates/web/base/report/new/top_message_none.html:9
+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/questionnaire/index.html:70
+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 ""
+"Si desea abandonar la actualización pública del problema, por favor introdúzcalo aquí\n"
+"(por favor, tenga en cuenta que no será enviado al ayuntamiento)."
+
+#: templates/web/base/admin/contact-form.html:30
+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í."
+
+#: templates/web/base/admin/open311-form-fields.html:100
+#: templates/web/base/admin/open311-form-fields.html:101
+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 ""
+"Si ha habilitado \"Open311 envío de actualizaciones\", tenga en cuenta que Open311 normalmente sólo acepta el estado ABIERTO o CERRADO en\n"
+"sus actualizaciones. Active <strong>Open311 extensión de status</ strong> si desea permitir que los estados adicionales sean también transferidos.\n"
+"Compruebe que su cobrand admite esta función antes de activarlo."
+
+#: templates/web/base/admin/open311-form-fields.html:87
+#: templates/web/base/admin/open311-form-fields.html:88
+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 ""
+"Si ha habilitado \"Open311 envío de actualizaciones\", active <strong>suprimir alertas</strong>\n"
+"si <strong>NO</ strong> deseas que el usuario sea notificado cada vez que se cree uno de estos updates."
+
+#: templates/web/base/admin/open311-form-fields.html:70
+#: templates/web/base/admin/open311-form-fields.html:71
+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 ""
+"Si ha habilitado \"Open311 envío de actualizaciones\", debe identificar qué \n"
+"<strong>usuario</ strong> de FixMyStreet aparece como creador de dichas actualizaciones\n"
+"en esta web. Introduzca el ID (número) del usuario."
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:133
+msgid "Illegal ID"
+msgstr "ID incorrecto"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:103
+msgid "Illegal feed selection"
+msgstr "Selección de listado incorrecta"
+
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:43
+msgid "In Progress"
+msgstr "Procesando"
+
+#: templates/web/base/admin/flagged.html:39
+msgid "In abuse table?"
+msgstr "¿En tabla de abusones?"
+
+#: 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 "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)."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:192
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:954
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/report/banner.html:19
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:8
+msgid "In progress"
+msgstr "Procesando"
+
+#: templates/web/base/tokens/confirm_alert.html:11
+msgid "Inbox zero, here we come!"
+msgstr "Bandeja de entrada vacía"
+
+#: templates/web/zurich/admin/report_edit.html:223
+msgid "Include reporter personal details"
+msgstr "Incluir datos del notificador"
+
+#: templates/web/base/admin/stats.html:83
+msgid "Include unconfirmed reports"
+msgstr "Incluir notificaciones no confirmadas"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+msgid "Incorrect has_photo value \"%s\""
+msgstr "Valor incorrecto para has_photo \"%s\""
+
+#: templates/web/base/admin/contact-form.html:84
+msgid "Inspection required"
+msgstr "Inspección requerida"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
+msgid "Instruct contractors to fix problems"
+msgstr "Dar instrucciones a los contratistas para que solucionen los problemas"
+
+#: templates/web/zurich/admin/list_updates.html:35
+msgid "Internal notes"
+msgstr "Notas internas"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:16
+msgid "Internal referral"
+msgstr "Remisión interna"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+msgid "Invalid agency_responsible value %s"
+msgstr "Valor inválido para agency_responsible %s"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+msgid "Invalid end date"
+msgstr "Fecha de fin inválida"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+msgid "Invalid format %s specified."
+msgstr "Especificado un formato no válido %s."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:361
+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."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+msgid "Invalid start date"
+msgstr "Fecha de inicio no válida"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:42
+msgid "Investigating"
+msgstr "Investigando"
+
+#: templates/web/base/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr "A menudo es más rápido <a href=\"%s\">consultar nuestro Listado de Preguntas Frecuentes</a> y ver si la respuesta está allí."
+
+#: templates/web/base/tokens/confirm_problem.html:27
+msgid "It’s on its way to the council right now."
+msgstr "De camino al ayuntamiento en este momento."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:177
+msgid "Jurisdiction Unknown"
+msgstr "Jurisdicción Desconocida"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:918
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:15
+msgid "Jurisdiction unknown"
+msgstr "Jurisdicción desconocida"
+
+#: templates/web/base/auth/general.html:91
+#: templates/web/base/report/new/form_user_loggedout_password.html:16
+#: templates/web/base/report/update/form_user_loggedout_password.html:15
+#: templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
+msgstr "Mantener mi sesión abierta en este ordenador"
+
+#: templates/web/base/admin/body.html:74
+#: templates/web/zurich/admin/body.html:16
+msgid "Last editor"
+msgstr "Último editor"
+
+#: templates/web/base/admin/report_edit.html:89
+msgid "Last update:"
+msgstr "Última actualización:"
+
+#: templates/web/base/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr "Última&nbsp;actualización:"
+
+#: templates/web/base/reports/_list-filters.html:38
+msgid "Least recently updated"
+msgstr "Menos recientemente actualizado"
+
+#: templates/web/base/admin/body-form.html:127
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo utilizan el mismo método de envío (e.g., \"%s\")."
+
+#: templates/web/base/admin/body.html:31
+msgid "List all reported problems"
+msgstr "Listar todos los problemas notificados"
+
+#: templates/web/base/report/new/category_wrapper.html:4
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: templates/web/base/alert/choose.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Listados RSS locales y alertas por email"
+
+#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12
+#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr "Listados RSS locales y alertas por email para '%s'"
+
+#: templates/web/base/footer.html:32
+msgid "Local alerts"
+msgstr "Alertas locales"
+
+#: templates/web/base/index-steps.html:5
+msgid "Locate the problem on a map of the area"
+msgstr "Señale en el mapa de la zona la localización del problema"
+
+#: templates/web/base/js/translation_strings.html:44
+msgid "MAP"
+msgstr "MAPA"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
+msgid "Manage shortlist"
+msgstr "Administrar los pre-seleccionados"
+
+#: templates/web/base/js/translation_strings.html:46
+msgid "Map"
+msgstr " Mapa"
+
+#: templates/web/base/admin/report_edit.html:86
+msgid "Mark as sent"
+msgstr "Marcado como enviado"
+
+#: templates/web/base/admin/user-form.html:92
+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."
+
+#: templates/web/base/reports/index.html:27
+msgid "Marked fixed/closed in the past eight weeks"
+msgstr "Marcado como resuelto/cerrado en las últimas ocho semanas"
+
+#: templates/web/base/reports/index.html:28
+msgid "Marked fixed/closed more than eight weeks ago"
+msgstr "Marcado como resuelto/cerrado hace más de ocho semanas"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
+msgid "Markup problem details"
+msgstr "Marcar los detalles del problema"
+
+#: templates/web/base/contact/index.html:98
+msgid "Message"
+msgstr "Mensaje:"
+
+#: templates/web/zurich/admin/report_edit.html:280
+msgid "Message to competent body:"
+msgstr "Mensaje al organismo administrativo competente:"
+
+#: templates/web/zurich/admin/report_edit.html:278
+msgid "Message to external body:"
+msgstr "Mensaje al organismo administrativo externo:"
+
+#: templates/web/base/admin/report_edit.html:71
+msgid "Missing bodies:"
+msgstr "Organismos administrativos perdidos:"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+msgid "Missing jurisdiction_id"
+msgstr "Falta jurisdiction_id"
+
+#: templates/web/base/report/_main.html:126
+msgid "Moderate"
+msgstr "Moderar"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
+msgid "Moderate report details"
+msgstr "Moderar los detalles del informe"
+
+#: templates/web/base/report/_main.html:126
+msgid "Moderate this report"
+msgstr "Moderar este informe"
+
+#: templates/web/zurich/admin/stats.html:34
+msgid "Moderated by division within one working day"
+msgstr "Moderado por el organismo durante el siguiente día laborable"
+
+#: templates/web/base/admin/stats.html:11
+msgid "Month"
+msgstr "Mes"
+
+#: templates/web/base/reports/_list-filters.html:39
+msgid "Most commented"
+msgstr "Lo más comentado"
+
+#: templates/web/base/admin/bodies.html:25
+#: templates/web/base/admin/body-form.html:24
+#: templates/web/base/admin/flagged.html:16
+#: templates/web/base/admin/flagged.html:37
+#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/list_updates.html:7
+#: templates/web/base/admin/reports.html:14
+#: templates/web/base/admin/responsepriorities/list.html:6
+#: templates/web/base/admin/users.html:16
+#: templates/web/base/auth/general.html:106
+#: templates/web/base/report/new/form_user_loggedin.html:40
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:7
+#: templates/web/base/report/update/form_name.html:23
+#: templates/web/base/reports/index.html:23
+#: templates/web/zurich/admin/body-form.html:4
+#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/report/new/fill_in_details_form.html:59
+msgid "Name"
+msgstr "Nombre"
+
+#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/responsepriorities/edit.html:13
+#: templates/web/base/admin/update_edit.html:34
+#: templates/web/base/admin/user-form.html:16
+#: templates/web/zurich/admin/stats.html:41
+msgid "Name:"
+msgstr "Nombre:"
+
+#: perllib/FixMyStreet/Script/Reports.pm:111
+msgid "Name: %s"
+msgstr "Nombre: %s"
+
+#: templates/web/base/report/_inspect.html:23
+msgid "Navigate to this problem"
+msgstr "Navegue a este problema"
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
+#: perllib/FixMyStreet/Geocode/OSM.pm:145
+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"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:128
+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:527
+#: perllib/FixMyStreet/Cobrand/Default.pm:567
+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:323
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+"Camino más cercano al pin colocado en el mapa (generada automáticamente por Bing Maps): %s\n"
+"\n"
+
+#: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5
+msgid "Nearly done! Now check your email&hellip;"
+msgstr "¡Casi hemos terminado! Lea su email&hellip;"
+
+#: templates/web/base/reports/index.html:24
+msgid "New <br>problems"
+msgstr "Nuevos <br>problemas"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:259
+msgid "New body added"
+msgstr "Nuevo organismo añadido"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:405
+msgid "New category contact added"
+msgstr "Añadida nueva categoría de contactos"
+
+#: templates/web/base/auth/change_email.html:26
+msgid "New email address:"
+msgstr "Nueva dirección de email:"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:109
+#: templates/web/zurich/admin/report_edit.html:137
+msgid "New internal note:"
+msgstr "Nueva nota interna:"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr "Nuevos problemas locales en FixMyStreet"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:113
+msgid "New note to DM:"
+msgstr "Nota nueva al DM:"
+
+#: templates/web/base/auth/change_password.html:35
+msgid "New password:"
+msgstr "Contraseña nueva:"
+
+#: templates/web/base/admin/responsepriorities/edit.html:4
+#: templates/web/base/admin/responsepriorities/list.html:32
+msgid "New priority"
+msgstr "Prioridad nueva"
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr "Nuevos problemas en {{COUNCIL}} para el barrio {{WARD}} en FixMyStreet"
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr "Nuevos problemas cerca de {{POSTCODE}} En FixMyStreet"
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr "Nuevos problemas en FixMyStreet"
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr "Nuevos problemas en {{COUNCIL}} en FixMyStreet"
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr "Nuevos problemas en los límites de {{NAME}} en FixMyStreet"
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr "Nuevos informes"
+
+#: templates/web/base/admin/questionnaire.html:24
+msgid "New state"
+msgstr "Nuevo estado"
+
+#: templates/web/base/admin/template_edit.html:4
+#: templates/web/base/admin/templates.html:28
+#: templates/web/zurich/admin/template_edit.html:9
+msgid "New template"
+msgstr "Plantilla nueva"
+
+#: templates/web/base/reports/_list-filters.html:35
+msgid "Newest"
+msgstr "Lo más reciente"
+
+#: templates/web/base/pagination.html:10
+msgid "Next"
+msgstr "Siguiente"
+
+#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
+#: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
+#: templates/web/base/admin/category_edit.html:4
+#: templates/web/base/admin/list_updates.html:32
+#: templates/web/base/admin/list_updates.html:34
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:95
+#: templates/web/base/admin/update_edit.html:26
+#: templates/web/base/questionnaire/creator_fixed.html:16
+#: templates/web/base/questionnaire/index.html:106
+#: templates/web/base/questionnaire/index.html:55
+msgid "No"
+msgstr "No"
+
+#: templates/web/base/admin/user-form.html:66
+msgid "No area"
+msgstr "Sin área"
+
+#: templates/web/base/admin/user-form.html:37
+msgid "No body"
+msgstr "Sin órgano administrativo"
+
+#: templates/web/base/admin/stats.html:93
+msgid "No council"
+msgstr "Sin ayuntamiento"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+msgid "No council selected"
+msgstr "Ningún ayuntamiento seleccionado"
+
+#: templates/web/base/admin/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr "No se han hecho ediciones aún."
+
+#: templates/web/base/admin/flagged.html:25
+msgid "No flagged problems found."
+msgstr "No se encuentran problemas marcados."
+
+#: templates/web/base/admin/flagged.html:58
+msgid "No flagged users found."
+msgstr "No se encuentran usuarios marcados"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:125
+#: templates/web/zurich/admin/report_edit.html:259
+msgid "No further updates"
+msgstr "No hay más actualizaciones"
+
+#: templates/web/base/js/translation_strings.html:37
+msgid "No result returned"
+msgstr "Ningún resultado devuelto"
+
+#: templates/web/base/admin/body-form.html:66
+#: templates/web/base/admin/body-form.html:67
+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 ""
+"No hay áreas específicas disponibles en la actualidad, debido a que el <code>MAPIT_URL</ code> en\n"
+"su archivo de configuración no está apuntando a un servicio MapIt activo."
+
+#: templates/web/base/report/_support.html:2
+#: templates/web/base/report/_support.html:4
+msgid "No supporters"
+msgstr "No hay seguidores"
+
+#: templates/web/base/admin/report_edit.html:66
+#: templates/web/base/admin/report_edit.html:90
+#: templates/web/base/admin/report_edit.html:92
+msgid "None"
+msgstr "Nada"
+
+#: templates/web/base/admin/user-form.html:58
+#: templates/web/base/admin/user-form.html:59
+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 ""
+"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/user-form.html:28
+#: templates/web/base/admin/user-form.html:29
+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 ""
+"Normalmente los usuarios (públicos) no deben estar asociados con ningún <strong>organismo</ strong>. <br>\n"
+"El personal autorizado puede ser asociado al organismo administrativo que representan. <br>\n"
+"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/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "Not Responsible"
+msgstr "No responsable"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:181
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:928
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:13
+msgid "Not contactable"
+msgstr "Imposible de contactar"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:104
+msgid "Not for my subdivision"
+msgstr "No para mi subdivisión"
+
+#: templates/web/base/admin/questionnaire.html:6
+msgid "Not reported before"
+msgstr "No notificado anteriormente"
+
+#: templates/web/base/report/_main_sent_info.html:4
+msgid "Not reported to council"
+msgstr "No comunicado al ayuntamiento"
+
+#: templates/web/base/admin/body.html:75
+#: templates/web/base/admin/category_edit.html:57
+#: templates/web/zurich/admin/body.html:17
+msgid "Note"
+msgstr "Nota"
+
+#: templates/web/base/admin/stats.html:51
+msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación, que puede no coincidir con el mes en se confirmó, así que los números pueden variar un poco."
+
+#: templates/web/zurich/admin/body.html:55
+#: templates/web/zurich/admin/contact-form.html:17
+msgid "Note:"
+msgstr "Nota:"
+
+#: templates/web/base/open311/index.html:65
+msgid "Note: <strong>%s</strong>"
+msgstr "Nota: <strong>%s</strong>"
+
+#: templates/web/zurich/admin/list_updates.html:21
+msgid "Notes from SDM to DM"
+msgstr "Notas de SDM a DM"
+
+#: templates/web/base/report/new/oauth_email_form.html:17
+msgid "Now to submit your report&hellip;"
+msgstr "Ahora a enviar tu notificación&hellip;"
+
+#: templates/web/base/report/update-form.html:29
+#: templates/web/base/report/update/form_user_loggedout.html:2
+#: templates/web/base/report/update/form_user_loggedout.html:23
+msgid "Now to submit your update&hellip;"
+msgstr "Ahora a enviar tu notificación&hellip;"
+
+#: templates/web/base/js/translation_strings.html:43
+msgid "OK"
+msgstr "OK"
+
+#: templates/web/base/reports/index.html:26
+msgid "Old / unknown <br>problems"
+msgstr "Problemas<br>Antiguos / desconocidos"
+
+#: templates/web/base/admin/questionnaire.html:24
+msgid "Old state"
+msgstr "Estado antiguo"
+
+#: templates/web/base/reports/index.html:28
+msgid "Older <br>fixed"
+msgstr "Antiguo <br>arreglado"
+
+#: templates/web/base/reports/index.html:25
+msgid "Older <br>problems"
+msgstr "Problemas <br>antiguos"
+
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Oldest"
+msgstr "Lo más antiguo"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:169
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:900
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:23
+#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:7
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Open"
+msgstr "Abierto"
+
+#: templates/web/base/reports/index.html:25
+msgid "Open for more than four weeks, with an update within the past eight weeks"
+msgstr "Abierto por más de cuatro semanas, con una actualización en las últimas ocho semanas"
+
+#: templates/web/base/reports/index.html:26
+msgid "Open, but not had any update in eight weeks"
+msgstr "Abierto, pero no ha sido actualizado en ocho semanas"
+
+#: templates/web/base/admin/open311-form-fields.html:47
+msgid "Open311 API Key"
+msgstr "Código Open311  API "
+
+#: templates/web/base/open311/index.html:62
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr "API Open311 para el servidor FixMyStreet de mySociety"
+
+#: templates/web/base/admin/open311-form-fields.html:34
+msgid "Open311 Jurisdiction"
+msgstr "Jurisdicción Open311 "
+
+#: templates/web/base/open311/index.html:72
+msgid "Open311 initiative web page"
+msgstr "Página web de la iniciativa Open311"
+
+#: templates/web/base/open311/index.html:73
+msgid "Open311 specification"
+msgstr "Especificación Open311"
+
+#: templates/web/base/alert/_list.html:61
+msgid "Or problems reported to:"
+msgstr "O problemas notificados a:"
+
+#: templates/web/base/alert/_list.html:37
+msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
+msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:594
+#: perllib/FixMyStreet/DB/Result/Problem.pm:601
+#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/Script/Reports.pm:185
+#: perllib/FixMyStreet/Script/Reports.pm:200
+msgid "Other"
+msgstr "Otros"
+
+#: templates/web/base/admin/list_updates.html:8
+msgid "Owner"
+msgstr "Propietario"
+
+#: 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 no encontrada"
+
+#: templates/web/base/admin/body-form.html:37
+#: templates/web/zurich/admin/body-form.html:14
+msgid "Parent"
+msgstr "Padre"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:18
+msgid "Partial"
+msgstr "Parcial"
+
+#: templates/web/base/auth/general.html:109
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:28
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:6
+#: templates/web/zurich/auth/general.html:32
+#: templates/web/zurich/auth/general.html:63
+msgid "Password (optional)"
+msgstr "Contraseña (opcional)"
+
+#: templates/web/base/auth/general.html:82
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: templates/web/base/js/translation_strings.html:49
+msgid "Permalink"
+msgstr "Enlace permanente"
+
+#: templates/web/base/admin/user-form.html:152
+msgid "Permissions:"
+msgstr "Licencias:"
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:65
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: templates/web/base/report/new/form_user_loggedin.html:57
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:25
+msgid "Phone number (optional)"
+msgstr "Número de teléfono (opcional)"
+
+#: perllib/FixMyStreet/Script/Reports.pm:87
+#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/user-form.html:21
+#: templates/web/zurich/admin/stats.html:39
+msgid "Phone:"
+msgstr "Teléfono:"
+
+#: templates/web/base/questionnaire/index.html:78
+#: templates/web/base/questionnaire/index.html:93
+#: templates/web/base/questionnaire/index.html:95
+#: templates/web/base/report/new/form_report.html:28
+#: templates/web/base/report/new/form_report.html:43
+#: templates/web/base/report/new/form_report.html:45
+#: 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/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/index-sdm.html:24
+#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/stats.html:37
+#: 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"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:186
+msgid "Photo is required."
+msgstr "Foto es obligatoria."
+
+#: templates/web/zurich/admin/contact-form.html:14
+msgid "Photo required"
+msgstr "Foto es obligatoria"
+
+#: templates/web/base/questionnaire/index.html:78
+#: templates/web/base/report/new/form_report.html:28
+#: templates/web/base/report/update/form_update.html:7
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Photos"
+msgstr "Fotos"
+
+#: templates/web/base/alert/list.html:23
+msgid "Photos of recent nearby reports"
+msgstr "Fotos de notificaciones cercanas recientes"
+
+#: templates/web/base/around/display_location.html:76
+#: templates/web/base/js/translation_strings.html:30
+msgid "Place pin on map"
+msgstr "Coloque el marcador en el mapa"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:940
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:946
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:141
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:9
+#: templates/web/zurich/admin/index-dm.html:9
+msgid "Planned"
+msgstr "Planificado"
+
+#: templates/web/base/report/new/notes.html:5
+msgid "Please be polite, concise and to the point."
+msgstr "Por favor, sea cortés, conciso y vaya al grano."
+
+#: templates/web/base/auth/change_password.html:22
+#: templates/web/base/auth/change_password.html:27
+msgid "Please check the passwords and try again"
+msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo"
+
+#: templates/web/base/auth/change_email.html:15
+#: templates/web/base/auth/change_email.html:18
+#: templates/web/base/auth/general.html:37
+#: templates/web/base/auth/general.html:43
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:9
+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.pm:350
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
+#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: templates/web/base/js/translation_strings.html:9
+msgid "Please choose a category"
+msgstr "Por favor, elija una categoría"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+msgid "Please choose a property type"
+msgstr "Por favor, elija un tipo de propiedad"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:396
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
+msgid "Please correct the errors below"
+msgstr "Por favor, corrija los errores a continuación"
+
+#: templates/web/base/contact/blurb.html:12
+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 "Por favor,  <strong>no</strong> reporte los problemas a través de este formulario; estos mensajes  se envían al equipo encargado de este site, no al ayuntamiento.  Para reportar un problema, por favor <a href=\"/\">vaya al comienzo de la página</a> y siga las instrucciones."
+
+#: 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 "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:351
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: templates/web/base/js/translation_strings.html:2
+msgid "Please enter a message"
+msgstr "Por favor escriba su mensaje."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+msgid "Please enter a name"
+msgstr "Por favor, indique un nombre"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:478
+msgid "Please enter a name for this body"
+msgstr "Por favor, indique un nombre para este organismo"
+
+#: templates/web/base/auth/change_password.html:22
+#: templates/web/base/auth/change_password.html:25
+#: templates/web/base/js/translation_strings.html:19
+msgid "Please enter a password"
+msgstr "Por favor, introduzca una contraseña"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:114
+#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: templates/web/base/js/translation_strings.html:3
+msgid "Please enter a subject"
+msgstr "Por favor, introduzca un título"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:363
+#: perllib/FixMyStreet/DB/Result/User.pm:164
+#: templates/web/base/js/translation_strings.html:12
+#: templates/web/base/js/translation_strings.html:16
+msgid "Please enter a valid email"
+msgstr "Por favor, introduce una dirección de email válida"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:350
+#: perllib/FixMyStreet/App/Controller/Contact.pm:124
+msgid "Please enter a valid email address"
+msgstr "Por favor, introduce una dirección de email válida"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: templates/web/base/js/translation_strings.html:4
+msgid "Please enter some details"
+msgstr "Por favor, describa los detalles más relevantes"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:113
+#: perllib/FixMyStreet/DB/Result/User.pm:161
+#: templates/web/base/auth/change_email.html:15
+#: templates/web/base/auth/change_email.html:17
+#: templates/web/base/auth/general.html:37
+#: templates/web/base/auth/general.html:42
+#: templates/web/base/js/translation_strings.html:11
+#: templates/web/base/js/translation_strings.html:15
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:8
+msgid "Please enter your email"
+msgstr "Por favor, introduzca su dirección de email"
+
+#: templates/web/base/report/new/form_user_loggedout_email.html:5
+#: templates/web/zurich/report/new/fill_in_details_form.html:57
+msgid "Please enter your email address"
+msgstr "Por favor introduzca su email"
+
+#: templates/web/base/js/translation_strings.html:25
+msgid "Please enter your first name"
+msgstr "Por favor, indique su nombre"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: templates/web/base/js/translation_strings.html:7
+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.pm:112
+#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/User.pm:157
+#: templates/web/base/js/translation_strings.html:6
+msgid "Please enter your name"
+msgstr "Por favor, introduzca su nombre"
+
+#: templates/web/base/js/translation_strings.html:22
+msgid "Please enter your phone number"
+msgstr "Por favor, introduzca su número de telefono"
+
+#: templates/web/base/js/translation_strings.html:26
+msgid "Please enter your second name"
+msgstr "Introduzca su segundo nombre"
+
+#: templates/web/base/js/translation_strings.html:24
+msgid "Please enter your title"
+msgstr "Por favor, introduzca su título"
+
+#: 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 "Por favor, siéntase libre para <a href=\"%s\">acceder nuevamente</a> o volver a la <a href=\"/\">página inicial</a>."
+
+#: templates/web/base/report/new/fill_in_details_text.html:1
+#: templates/web/base/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr "Por favor proporcione a continuación las informaciones sobre el problema."
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:49
+msgid "Please fill in details of the problem."
+msgstr "Por favor proporcione las informaciones sobre el problema."
+
+#: 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, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles."
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario"
+
+#: templates/web/base/report/updates-sidebar-notes.html:2
+msgid "Please note that updates are not sent to the council."
+msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento."
+
+#: templates/web/base/report/new/oauth_email_form.html:4
+msgid "Please note your report has <strong>not yet been sent</strong>."
+msgstr "Por favor, tenga en cuenta que su informe no ha <strong>sido aún enviado</strong>."
+
+#: templates/web/base/report/new/fill_in_details_form.html:12
+#: 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 "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categoría y añada más información a continuación antes de enviar."
+
+#: templates/web/base/report/display.html:34
+msgid "Please note your update has <strong>not yet been posted</strong>."
+msgstr "Por favor, tenga en cuenta que su actualización no ha <strong>sido aún enviada</strong>."
+
+#: templates/web/base/report/new/notes.html:1
+#: templates/web/zurich/report/new/notes.html:1
+msgid "Please note:"
+msgstr "Por favor, tenga en cuenta:"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:335
+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:243
+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:250
+msgid "Please provide some text as well as a photo"
+msgstr "Proporcione un texto y una foto"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+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/zurich/admin/report_edit.html:204
+msgid "Please select a body."
+msgstr "Por favor, seleccione un organismo administrativo"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:83
+msgid "Please select the feed you want"
+msgstr "Por favor, seleccione el tipo de listado que desea"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:131
+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:232
+msgid "Please state whether or not the problem has been fixed"
+msgstr "Por favor, indique si el problema se ha solucionado"
+
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
+#: templates/web/base/js/translation_strings.html:54
+msgid "Please upload an image only"
+msgstr "Por favor, suba solo una imagen"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:115
+msgid "Please write a message"
+msgstr "Por favor, escriba un mensaje"
+
+#: templates/web/base/report/update/form_update.html:36
+msgid "Please write your update here"
+msgstr "Por favor, escriba su actualización aquí"
+
+#: templates/web/base/contact/index.html:105
+#: templates/web/base/report/update-form.html:25
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:14
+#: templates/web/base/report/update/form_user_loggedout_password.html:10
+msgid "Post"
+msgstr "Publicar"
+
+#: templates/web/base/report/updates.html:15
+msgid "Posted anonymously at %s"
+msgstr "Publicado de forma anónima - %s"
+
+#: templates/web/base/report/updates.html:22
+msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgstr "Publicado por %s (<strong>%s</strong>) - %s"
+
+#: templates/web/base/report/updates.html:24
+msgid "Posted by %s at %s"
+msgstr "Publicado por %s - %s"
+
+#: templates/web/base/front/footer-marketing.html:12
+msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
+msgstr "Con la tecnología de <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
+
+#: templates/web/base/pagination.html:4
+msgid "Previous"
+msgstr "Previo"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:665
+msgid "Priorities"
+msgstr "Prioridades"
+
+#: templates/web/base/report/_inspect.html:87
+msgid "Priority"
+msgstr "Prioridad"
+
+#: templates/web/base/footer.html:38
+msgid "Privacy"
+msgstr "Privacidad"
+
+#: 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 "Privacidad y cookies"
+
+#: templates/web/base/admin/body.html:91
+#: templates/web/base/admin/contact-form.html:74
+#: templates/web/base/admin/report_edit.html:155
+msgid "Private"
+msgstr "Privado"
+
+#: templates/web/base/maps/pin.html:13
+msgid "Problem"
+msgstr "Problema"
+
+#: templates/web/base/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr "Problema %d creado"
+
+#: templates/web/base/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr "Problema %s confirmado"
+
+#: templates/web/base/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr "Problema %s enviado al Ayuntamiento %s"
+
+#: templates/web/base/admin/stats.html:57
+#: templates/web/base/admin/stats_by_state.html:12
+#: templates/web/zurich/admin/index.html:9
+msgid "Problem breakdown by state"
+msgstr "Desglose de problemas según estado"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+msgid "Problem marked as open."
+msgstr "Problema marcado como abierto."
+
+#: templates/web/base/admin/questionnaire.html:21
+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:706
+#: templates/web/base/admin/flagged.html:10
+msgid "Problems"
+msgstr "Problemas"
+
+#: templates/web/base/report/display_tools.html:20
+msgid "Problems nearby"
+msgstr "Problemas cercanos"
+
+#: templates/web/base/report/display_tools.html:18
+msgid "Problems on the map"
+msgstr "Problemas en el mapa"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
+
+#: templates/web/base/alert/_list.html:22
+msgid "Problems within %.1fkm of this location"
+msgstr "Problemas en %.1fkm alrededor"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
+#: perllib/FixMyStreet/Cobrand/UK.pm:208
+msgid "Problems within %s"
+msgstr "Problemas en %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
+msgid "Problems within %s ward"
+msgstr "Problemas en el barrio %s"
+
+#. ("First %s is the body name, second %s the site name")
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:25
+msgid "Problems within %s, %s"
+msgstr "Problemas dentro %s, %s"
+
+#: templates/web/base/alert/_list.html:43
+msgid "Problems within the boundary of:"
+msgstr "Problemas en:"
+
+#: templates/web/base/admin/report_edit.html:74
+msgid "Property address:"
+msgstr "Dirección de la propiedad:"
+
+#: templates/web/base/report/update-form.html:6
+msgid "Provide an update"
+msgstr "Proporcionar una actualización"
+
+#: templates/web/base/report/update/form_name.html:9
+msgid "Provide update as"
+msgstr "Proporcionar la actualización como"
+
+#: templates/web/base/auth/general.html:112
+msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes."
+
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:31
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:9
+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."
+
+#: templates/web/zurich/admin/report_edit.html:241
+#: templates/web/zurich/admin/report_edit.html:268
+msgid "Public response:"
+msgstr "Respuesta del público:"
+
+#: templates/web/base/report/_inspect.html:125
+msgid "Public update:"
+msgstr "Actualización pública:"
+
+#: templates/web/zurich/admin/report_edit.html:123
+#: templates/web/zurich/admin/stats.html:38
+msgid "Publish photo"
+msgstr "Publicar foto"
+
+#: 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 "Cuestionario"
+
+#: templates/web/base/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr "Cuestionario %d para el problema %d respondido, %s para %s"
+
+#: templates/web/base/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr "Cuestionario %d enviado para el problema %d"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+msgid "Questionnaire filled in by problem reporter"
+msgstr "Cuestionario cumplimentado por el notificador problema"
+
+#: templates/web/base/alert/_list.html:23
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/around/display_location.html:1
+#: templates/web/base/around/display_location.html:3
+#: templates/web/base/report/display_tools.html:40
+msgid "RSS feed"
+msgstr "Listado RSS"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+msgid "RSS feed for %s"
+msgstr "Listado RSS para %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+msgid "RSS feed for %s ward, %s"
+msgstr "Listado RSS para %s del barrio, %s"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
+#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+msgid "RSS feed of %s"
+msgstr "Listado RSS para %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+msgid "RSS feed of %s, within %s ward"
+msgstr "Listado RSS para %s, en el barrio %s"
+
+#: templates/web/base/alert/_list.html:23
+msgid "RSS feed of nearby problems"
+msgstr "Listado RSS de los problemas cercanos"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
+#: perllib/FixMyStreet/Cobrand/UK.pm:215
+msgid "RSS feed of problems within %s"
+msgstr "Listado RSS de los problemas dentro de %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:221
+msgid "RSS feed of problems within %s ward"
+msgstr "Listado RSS de los problemas dentro del barrio %s"
+
+#: templates/web/base/around/display_location.html:1
+#: templates/web/base/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr "Listado RSS de los problemas locales más recientes"
+
+#: templates/web/base/alert/updates.html:9
+#: templates/web/base/report/display_tools.html:40
+msgid "RSS feed of updates to this problem"
+msgstr "Listado RSS de actualizaciones sobre este problema"
+
+#: templates/web/base/alert/updates.html:14
+#: templates/web/base/report/display_tools.html:42
+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:720
+msgid "Received by %s moments later"
+msgstr "Recibido por unos %s momentos tarde"
+
+#. ("%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 "Problemas locales recientes, %s"
+
+#: templates/web/base/reports/index.html:27
+msgid "Recently <br>fixed"
+msgstr "Recientemente <br>arreglado"
+
+#: templates/web/base/front/recent.html:11
+msgid "Recently reported problems"
+msgstr "Problemas recientemente notificados"
+
+#: templates/web/base/reports/_list-filters.html:37
+msgid "Recently updated"
+msgstr "Recientemente actualizado"
+
+#: 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 "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/report_blocks.html:46
+msgid "Remove flag"
+msgstr "Eliminar marca"
+
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:18
+#: templates/web/base/report/_main.html:24
+msgid "Remove from shortlist"
+msgstr "Eliminar de los pre-seleccionados"
+
+#: templates/web/base/report/display_tools.html:6
+msgid "Remove from site"
+msgstr "Eliminar de la site"
+
+#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/update_edit.html:69
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr "Quitar foto (¡no se puede deshacer!)"
+
+#: templates/web/zurich/admin/report_edit.html:239
+msgid "Reply to user:"
+msgstr "Responder al usuario:"
+
+#: templates/web/base/header_logo.html:2
+msgid "Report"
+msgstr "Notificar"
+
+#: templates/web/base/report/_inspect.html:11
+msgid "Report ID:"
+msgstr "ID del informe:"
+
+#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
+#: templates/web/zurich/footer.html:19
+#: templates/web/zurich/nav_over_content.html:4
+msgid "Report a problem"
+msgstr "Notificar un problema"
+
+#: templates/web/base/report/display_tools.html:9
+msgid "Report abuse"
+msgstr "Denunciar abuso"
+
+#: templates/web/base/report/new/form_user_loggedin.html:16
+msgid "Report as"
+msgstr "Notificar como:"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:298
+msgid "Report on %s"
+msgstr "Notificar sobre %s"
+
+#: templates/web/base/report/new/fill_in_details_form.html:1
+#: templates/web/base/report/new/login_success_form.html:1
+#: templates/web/base/report/new/oauth_email_form.html:1
+msgid "Report your problem"
+msgstr "Notifique su incidencia"
+
+#: templates/web/base/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr "Notifique, consulte o discuta problemas locales"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:605
+#: templates/web/base/contact/index.html:57
+msgid "Reported anonymously at %s"
+msgstr "Notificado anónimamente en %s"
+
+#: templates/web/base/admin/questionnaire.html:5
+#: templates/web/base/questionnaire/index.html:64
+msgid "Reported before"
+msgstr "Notificado con anterioridad"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:621
+#: templates/web/base/contact/index.html:59
+msgid "Reported by %s at %s"
+msgstr "Notificado por %s en %s"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:60
+#: templates/web/zurich/admin/report_edit.html:88
+msgid "Reported by:"
+msgstr "Notificado por:"
+
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
+msgstr "Notificado en la categoría %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+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:618
+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:599
+msgid "Reported via %s anonymously at %s"
+msgstr "Notificado anónimamente vía %s  en %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+msgid "Reported via %s by %s at %s"
+msgstr "Notificado vía %s por %s en %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+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:610
+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"
+
+#: templates/web/base/reports/index.html:24
+msgid "Reported within the last four weeks"
+msgstr "Notificado en las últimas cuatro semanas"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:38
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "Reported:"
+msgstr "Notificado:"
+
+#: templates/web/base/around/index.html:2
+#: templates/web/base/around/lookup_by_ref.html:2
+#: templates/web/base/js/translation_strings.html:42
+#: templates/web/base/report/new/fill_in_details.html:0
+#: templates/web/base/report/new/fill_in_details.html:8
+#: templates/web/zurich/report/new/fill_in_details_form.html:4
+msgid "Reporting a problem"
+msgstr "Notificando un problema"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:655
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/zurich/header.html:52
+msgid "Reports"
+msgstr "Informes"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación."
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr "Informes en espera de aprobación"
+
+#: templates/web/base/admin/user-form.html:127
+msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
+msgstr "Los informes de usuarios con una reputación suficientemente alta serán enviados inmediatamente sin requerir inspección.  Cada umbral de categoría puede ser administrado en su página de edición.  Los usuarios ganan reputación cuando un reporte que hayan hecho sea marcado como inspeccionado por los inspectores."
+
+#: templates/web/base/admin/user-form.html:107
+msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
+msgstr "Lo informes hechos por usuarios acreditados serán enviados al organismo administrativo responsable sin ser antes inspeccionados."
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr "Notificaciones publicadas"
+
+#: templates/web/base/admin/index.html:50
+msgid "Reports waiting to be sent"
+msgstr "Informes esperando a ser enviados"
+
+#: templates/web/base/admin/contact-form.html:89
+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 informes serán automáticamente enviados sin necesidad de verificar si <strong>la reputación</strong> del usuario está al nivel o más de este valor.  Ajustar a strong>0</strong> si todos los informes deben ser verificados sí o sí. "
+
+#: templates/web/base/admin/contact-form.html:94
+msgid "Reputation threshold"
+msgstr "Umbral de reputación"
+
+#: templates/web/base/admin/user-form.html:130
+msgid "Reputation:"
+msgstr "Reputación:"
+
+#: templates/web/base/admin/report_edit.html:84
+msgid "Resend report"
+msgstr "Vuelva a enviar la notificación"
+
+#: templates/web/base/admin/responsepriorities/index.html:1
+msgid "Response Priorities"
+msgstr "Prioridades de las respuestas"
+
+#: templates/web/base/admin/responsepriorities/list.html:1
+msgid "Response Priorities for %s"
+msgstr "Prioridades de las respuestas por %s"
+
+#: templates/web/base/admin/responsepriorities/edit.html:1
+msgid "Response Priority for %s"
+msgstr "Prioridad de la respuesta por %s"
+
+#: templates/web/base/admin/template_edit.html:1
+msgid "Response Template for %s"
+msgstr "Plantilla de respuesta por %s"
+
+#: templates/web/base/admin/templates_index.html:1
+msgid "Response Templates"
+msgstr "Plantillas de respuesta"
+
+#: templates/web/base/admin/templates.html:1
+#: templates/web/base/admin/templates.html:4
+#: templates/web/zurich/admin/template_edit.html:1
+#: templates/web/zurich/admin/template_edit.html:4
+msgid "Response Templates for %s"
+msgstr "Plantillas de respuesta por %s"
+
+#: templates/web/base/js/translation_strings.html:28
+#: templates/web/base/js/translation_strings.html:40
+msgid "Right place?"
+msgstr "¿Es correcto el lugar?"
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167
+#: perllib/FixMyStreet/Geocode/OSM.pm:152
+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/FixaMinGata.pm:164
+#: perllib/FixMyStreet/Geocode/OSM.pm:149
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
+#: templates/web/base/admin/report_edit.html:169
+#: templates/web/base/admin/update_edit.html:66
+#: templates/web/zurich/admin/report_edit.html:118
+msgid "Rotate Left"
+msgstr "Rotar a la izquierda"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
+#: templates/web/base/admin/report_edit.html:170
+#: templates/web/base/admin/update_edit.html:67
+#: templates/web/zurich/admin/report_edit.html:119
+msgid "Rotate Right"
+msgstr "Rotar a la derecha"
+
+#: templates/web/zurich/admin/report_edit.html:110
+msgid "Rotating this photo will discard unsaved changes to the report."
+msgstr "Rotar esta foto eliminará los cambios no guardados al informe."
+
+#: templates/web/base/js/translation_strings.html:47
+#: templates/web/base/maps/google-ol.html:9
+msgid "Satellite"
+msgstr "Satélite"
+
+#: templates/web/base/admin/contact-form.html:137
+#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/report/_inspect.html:142
+#: templates/web/zurich/admin/body.html:62
+#: templates/web/zurich/admin/contact-form.html:20
+#: templates/web/zurich/admin/template_edit.html:29
+msgid "Save changes"
+msgstr "Guardar cambios"
+
+#: templates/web/base/report/_inspect.html:121
+msgid "Save with a public update"
+msgstr "Guardar con una actualización pública"
+
+#: templates/web/base/admin/index.html:24
+#: templates/web/base/admin/reports.html:1
+#: templates/web/zurich/admin/reports.html:1
+msgid "Search Reports"
+msgstr "Buscar Notificaciones"
+
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+msgid "Search Users"
+msgstr "Buscar Usuarios"
+
+#: templates/web/zurich/header.html:74
+msgid "Search reports"
+msgstr "Buscar informes"
+
+#: templates/web/base/admin/reports.html:5
+#: templates/web/base/admin/users.html:8
+#: templates/web/zurich/admin/reports.html:5
+msgid "Search:"
+msgstr "Buscar:"
+
+#: templates/web/base/admin/reports.html:27
+msgid "Searching found no reports."
+msgstr "La búsqueda no encontró notificaciones."
+
+#: templates/web/base/admin/users.html:42
+msgid "Searching found no users."
+msgstr "La búsqueda no encontró usuarios."
+
+#: templates/web/base/report/new/councils_text_private.html:7
+#: templates/web/base/report/new/form_user.html:5
+msgid "See our privacy policy"
+msgstr "Ver nuestra política de privacidad"
+
+#: templates/web/base/admin/body-form.html:39
+#: templates/web/zurich/admin/body-form.html:16
+msgid "Select a body"
+msgstr "Selecciona un órgano administrativo"
+
+#: templates/web/base/reports/index.html:12
+msgid "Select a particular council to see the reports sent there."
+msgstr "Seleccione un ayuntamiento para ver los informes que se le han enviado."
+
+#: templates/web/base/admin/body-form.html:77
+#: templates/web/zurich/admin/body-form.html:26
+msgid "Select an area"
+msgstr "Seleccione un área"
+
+#: templates/web/base/alert/_list.html:11
+msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
+msgstr "Seleccione qué tipo de alerta le gustaría recibir y haga click en el botón para un listado RSS, o escriba su dirección de email para suscribirse a una alerta por correo."
+
+#: templates/web/base/admin/category-checkboxes.html:6
+msgid "Select:"
+msgstr "Seleccionar:"
+
+#: templates/web/base/admin/open311-form-fields.html:109
+msgid "Send extended Open311 statuses with service request updates"
+msgstr "Enviar estados Open311 extendidos con actualizaciones de pedidos de servicio"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:826
+msgid "Sent report back"
+msgstr "Devolver el informe"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+msgid "Sent to %s %s later"
+msgstr "Enviado a %s %s después"
+
+#: templates/web/base/admin/report_edit.html:79
+msgid "Sent:"
+msgstr "Enviado:"
+
+#: templates/web/base/admin/report_edit.html:90
+#: templates/web/zurich/admin/stats.html:45
+msgid "Service:"
+msgstr "Servicio:"
+
+#: templates/web/base/report/_inspect.html:26
+msgid "Set to my current location"
+msgstr "Ajustar a mi ubicación actual"
+
+#: templates/web/base/report/display_tools.html:15
+msgid "Share"
+msgstr "Compartir"
+
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:21
+#: templates/web/base/report/_main.html:26
+msgid "Shortlist"
+msgstr "Pre-seleccionados"
+
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:20
+#: templates/web/base/report/_main.html:23
+msgid "Shortlisted"
+msgstr "Entre los pre-seleccionados"
+
+#: templates/web/base/report/_main.html:140
+msgid "Shortlisted by %s"
+msgstr "Pre-seleecionados por %s"
+
+#: templates/web/base/report/new/form_user_loggedin.html:54
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:22
+#: templates/web/base/report/update/form_name.html:33
+msgid "Show my name publicly"
+msgstr "Mostrar mi nombre públicamente"
+
+#: templates/web/base/around/display_location.html:69
+msgid "Show old"
+msgstr "Mostrar antiguos"
+
+#: templates/web/base/around/display_location.html:60
+msgid "Show pins"
+msgstr "Mostrar marcadores"
+
+#: templates/web/base/auth/general.html:117
+#: templates/web/base/auth/general.html:3
+#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/zurich/auth/general.html:18
+#: templates/web/zurich/auth/general.html:35
+msgid "Sign in"
+msgstr "Iniciar sesión"
+
+#: templates/web/base/auth/general.html:96
+msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
+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/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr "Iniciar sesión o crear una cuenta"
+
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr "Salir"
+
+#: templates/web/base/report/new/fill_in_details_text.html:1
+msgid "Some categories may require additional information."
+msgstr "Algunas categorías pueden requerir información adicional."
+
+#: templates/web/base/admin/open311-form-fields.html:40
+#: templates/web/base/admin/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 ""
+"Algunos puntos finales requieren una clave de <strong>API</ strong> para indicar que las notificaciones provienen\n"
+"de tu sistema FixMyStreet."
+
+#: templates/web/base/alert/index.html:40
+msgid "Some photos of recent reports"
+msgstr "Algunas fotos de notificaciones recientes"
+
+#. ('Optional comment for translator')
+#: perllib/FixMyStreet/Template.pm:53
+msgid "Some text to localize"
+msgstr "Algún texto para localizar"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:79
+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."
+
+#: templates/web/base/auth/token.html:8
+msgid "Sorry, that wasn&rsquo;t a valid link"
+msgstr "Lo sentimos, este no fue&rsquo; un enlace válido"
+
+#: templates/web/base/tokens/abuse.html:5
+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:222
+#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
+#: perllib/FixMyStreet/Geocode/OSM.pm:48
+msgid "Sorry, we could not find that location."
+msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
+
+#: templates/web/base/auth/general.html:9
+#: templates/web/base/report/display.html:29
+#: templates/web/base/report/new/fill_in_details_form.html:15
+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:35
+#: perllib/FixMyStreet/Geocode/Google.pm:45
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+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/Model/PhotoSet.pm:146
+msgid "Sorry, we couldn't save your image(s), please try again."
+msgstr "Lo sentimos, no pudimos guardar su(s) imagen(es), por favor inténtelo de nuevo."
+
+#: perllib/FixMyStreet/App/Controller/Root.pm:107
+msgid "Sorry, you don't have permission to do that."
+msgstr "Lo sentimos, no tiene permiso para hacer eso."
+
+#: templates/web/base/reports/_list-filters.html:33
+msgid "Sort by"
+msgstr "Seleccionado por"
+
+#: templates/web/base/admin/user-form.html:47
+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/user-form.html:50
+msgid "Staff:"
+msgstr "Personal:"
+
+#: templates/web/base/admin/stats.html:71
+msgid "Start Date:"
+msgstr "Fecha de inicio:"
+
+#: templates/web/base/admin/body.html:73
+#: templates/web/base/admin/flagged.html:18
+#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/list_updates.html:11
+#: templates/web/base/admin/reports.html:16
+#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/report/update/form_update.html:39
+msgid "State"
+msgstr "Estado"
+
+#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:75
+#: templates/web/zurich/admin/report_edit.html:103
+#: templates/web/zurich/admin/report_edit.html:151
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr "Estado/Prov.:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:640
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:386
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/stats_by_state.html:1
+#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
+msgid "Stats"
+msgstr "Estadísticas"
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Status"
+msgstr "Estado"
+
+#: templates/web/base/report/updates.html:10
+msgid "Still open, via questionnaire, %s"
+msgstr "Sigue abierta, a través de cuestionario, %s"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:27
+#: templates/web/zurich/admin/report_edit.html:28
+msgid "Street View"
+msgstr "Vista de calle"
+
+#: perllib/FixMyStreet/Script/Reports.pm:194
+msgid "Subcategory: %s"
+msgstr "Subcategoria: %s"
+
+#: templates/web/zurich/admin/index-dm.html:27
+msgid "Subdivision/Body"
+msgstr "Subdivisión/Órgano"
+
+#: templates/web/base/contact/index.html:90
+msgid "Subject"
+msgstr "Título"
+
+#: templates/web/base/admin/report_edit.html:110
+#: templates/web/zurich/admin/report_edit.html:41
+msgid "Subject:"
+msgstr "Título:"
+
+#: templates/web/base/questionnaire/creator_fixed.html:19
+#: templates/web/base/report/new/form_user_loggedin.html:61
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:36
+#: templates/web/base/report/new/form_user_loggedout_password.html:11
+#: templates/web/zurich/report/new/fill_in_details_form.html:73
+msgid "Submit"
+msgstr "Enviar"
+
+#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:24
+#: templates/web/base/admin/update_edit.html:77
+#: templates/web/base/admin/user-form.html:177
+#: templates/web/zurich/admin/report_edit-sdm.html:124
+#: templates/web/zurich/admin/report_edit.html:264
+#: templates/web/zurich/admin/update_edit.html:38
+msgid "Submit changes"
+msgstr "Enviar cambios"
+
+#: templates/web/base/questionnaire/index.html:110
+msgid "Submit questionnaire"
+msgstr "Enviar cuestionario"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:164
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:893
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:6
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Submitted"
+msgstr "Enviado"
+
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:49
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+#: templates/web/base/alert/_list.html:93
+msgid "Subscribe me to an email alert"
+msgstr "Suscríbeme a alertas por email"
+
+#: templates/web/base/report/new/form_report.html:19
+msgid "Summarise the problem"
+msgstr "Resuma el problema"
+
+#: templates/web/base/admin/contact-form.html:129
+msgid "Summarise your changes"
+msgstr "Resuma sus cambios"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:638
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:382
+#: templates/web/base/admin/bodies.html:29
+#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
+#: templates/web/base/status/index.html:3
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:13
+#: templates/web/zurich/header.html:49
+msgid "Summary"
+msgstr "Resumen"
+
+#: templates/web/base/reports/index.html:4
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:4
+msgid "Summary reports"
+msgstr "Resumen de notificaciones"
+
+#: templates/web/base/admin/user-form.html:141
+msgid "Superuser:"
+msgstr "Súperusuario:"
+
+#: templates/web/base/admin/user-form.html:138
+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."
+
+#: templates/web/base/admin/questionnaire.html:1
+#: templates/web/base/admin/stats.html:56
+msgid "Survey Results"
+msgstr "Resultados de la Encuesta"
+
+#: templates/web/zurich/admin/template_edit.html:7
+msgid "Template &laquo;%s&raquo;"
+msgstr "Plantilla &laquo;%s&raquo;"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:661
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:393
+#: templates/web/zurich/header.html:69
+msgid "Templates"
+msgstr "Plantillas"
+
+#: templates/web/base/admin/list_updates.html:12
+#: templates/web/base/admin/templates.html:11
+msgid "Text"
+msgstr "Texto"
+
+#: templates/web/base/admin/body.html:32
+msgid "Text only version"
+msgstr "Versión solo texto"
+
+#: templates/web/base/admin/template_edit.html:17
+#: templates/web/base/admin/update_edit.html:20
+#: templates/web/zurich/admin/template_edit.html:24
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr "Texto:"
+
+#: templates/web/base/tokens/confirm_problem.html:25
+msgid "Thank you for reporting this issue!"
+msgstr "¡Gracias por notificar esta incidencia!"
+
+#: 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 "Gracias por tratar de confirmar la actualización o problema. Parece que tenemos un error interno, así que <a href=\"%s\"> por favor, háganos saber lo que pasó </a> y echaremos un vistazo."
+
+#: templates/web/base/tokens/confirm_update.html:15
+msgid "Thank you for updating this issue!"
+msgstr "Gracias por actualizar esta incidencia!"
+
+#: templates/web/base/contact/submit.html:6
+msgid "Thank you for your enquiry"
+msgstr "Gracias por su consulta"
+
+#: templates/web/base/questionnaire/completed.html:5
+msgid "Thank you for your feedback"
+msgstr "Gracias por su feedback"
+
+#: templates/web/base/around/_error_multiple.html:17
+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 "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así que por favor escriba el nombre o código postal de una calle cercana en el cuadro de arriba:"
+
+#: 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 "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?"
+
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo."
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:102
+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:129
+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/Cobrand/FiksGataMi.pm:45
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
+#: perllib/FixMyStreet/Cobrand/UK.pm:72
+msgid "That postcode was not recognised, sorry."
+msgstr "Ese código postal no fue reconocido, lo siento."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:762
+msgid "That problem has been marked as sent."
+msgstr "El problema se ha marcado como enviado."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:755
+msgid "That problem will now be resent."
+msgstr "El problema ahora será reenviado."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:137
+msgid "That report cannot be viewed on %s."
+msgstr "Esa notificación no se puede ver en %s."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:131
+msgid "That report has been removed from FixMyStreet."
+msgstr "Esa notificación ha sido eliminada de FixMyStreet."
+
+#: templates/web/base/admin/contact-form.html:25
+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."
+
+#: templates/web/base/admin/open311-form-fields.html:14
+#: templates/web/base/admin/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 ""
+"El <strong>destino</strong> es la URL del servicio al que FixMyStreet se conectará \n"
+"cuando envíe notificaciones al organismo administrativo."
+
+#: templates/web/base/admin/open311-form-fields.html:27
+#: templates/web/base/admin/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 "La <strong>jurisdicción</strong> solo es necesaria si los límites incluyen a más de un municipio. Si el organismo administrativo funciona solo con sus propios límites puede dejar en blanco esto."
+
+#: templates/web/base/admin/body-form.html:100
+#: templates/web/base/admin/body-form.html:101
+#: templates/web/base/admin/contact-form.html:103
+#: templates/web/base/admin/contact-form.html:104
+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 ""
+"El <strong>método de envío</strong> determina como serán enviados las notificaciones al organismo.\n"
+"Si está en blanco, el método de envío por defecto será por <strong>email</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 "El atributo Open311 v2 agency_responsible se utiliza para listar las administraciones que han recibido la notificación de problemas, que no es exactamente la forma en que se define dicho atributo en la especificación Open311 v2."
+
+#: templates/web/base/admin/body-form.html:17
+#: templates/web/base/admin/body-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 ""
+"El <strong>nombre</strong> del organismo identifica al propio organismo administrativo (por ejemplo, <em>Ayuntamiento de Elche</em>)\n"
+"y puede ser mostrado públicamente. "
+
+#: templates/web/base/report/new/fill_in_details_text.html:1
+#: 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 "El ayuntamiento necesita la mayor cantidad de detalles posibles para atender su notificación. Por favor, describa la ubicación exacta del problema (e.g. \"sobre tal o cual pared\"), en qué consiste éste, el tiempo que lleva ahí, una descripción y si es posible también una foto que permita localizarlo, etc."
+
+#: templates/web/base/admin/edit-league.html:3
+#: templates/web/base/admin/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr "Los premios a la responsabilidad muestran la actividad de los editores (quién ha editado más registros)."
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61
+#: perllib/FixMyStreet/App/Controller/Reports.pm:82
+msgid "The error was: %s"
+msgstr "El error fue: %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 "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/FixaMinGata.pm:159
+#: perllib/FixMyStreet/Geocode/OSM.pm:144
+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."
+
+#: 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 "Últimos problemas notificados por usuarios"
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr "Últimos problemas para {{COUNCIL}} notificados por los usuarios"
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr "Últimos problemas para {{COUNCIL}} en el barrio de {{WARD}} notificados por los usuarios"
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr "Últimos problemas notificados por los usuarios"
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr "Últimos problemas notificados por los usuarios como arreglados"
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr "Últimos problemas dentro de los límites de {{NAME}} notificados por los usuarios"
+
+#: 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 "El enlace podría haber caducado, o quizá usted no&rsquo; lo copió y pegó correctamente."
+
+#: templates/web/base/admin/body-form.html:64
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr "La lista de áreas disponibles está siendo ofrecida por el servicio MapIt en %s."
+
+#: templates/web/base/auth/change_password.html:22
+#: templates/web/base/auth/change_password.html:26
+msgid "The passwords do not match"
+msgstr "Las contraseñas no coinciden."
+
+#: templates/web/base/errors/page_error_404_not_found.html:9
+msgid "The requested URL '%s' was not found on this server"
+msgstr "La URL solicitada, '%s', no fue encontrada en el servidor"
+
+#: templates/web/base/alert/_list.html:17
+msgid "The simplest alert is our geographic one:"
+msgstr "La alerta más sencilla es nuestra alerta geográfica:"
+
+#: perllib/FixMyStreet/Script/Reports.pm:96
+msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo."
+
+#: templates/web/base/admin/user-form.html:10
+#: templates/web/base/admin/user-form.html:11
+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 ""
+"El usuario <strong>name</ strong> aparece públicamente en los informes que no han sido marcados como <em>anónimos</em>.\n"
+"Los nombres no son necesariamente únicos."
+
+#: templates/web/base/around/on_map_list_items.html:12
+#: templates/web/base/my/_problem-list.html:8
+#: templates/web/base/reports/_problem-list.html:13
+msgid "There are no reports to show."
+msgstr "No hay ninguna notificación que mostrar."
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:79
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde."
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:137
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
+msgid "There was a problem showing this page. Please try again later."
+msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
+#: templates/web/base/auth/general.html:53
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
+msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario."
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:359
+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."
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357
+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."
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:141
+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:392
+msgid "There were problems with your update. Please see below."
+msgstr "Hubo problemas con su actualización. Por favor, vea más abajo."
+
+#: templates/web/base/admin/open311-form-fields.html:3
+#: templates/web/base/admin/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 ""
+"Estos ajustes son para los organismos que utilizan Open311 (u otra integración back-end) para recibir las incidencias.<br>\n"
+"<Strong>Usted no tiene necesidad de hacerlo si el Método de Envío es por correo electrónico.</ Strong>.\n"
+"Para obtener más información sobre Open311, consulte\n"
+"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>este documento</a>."
+
+#: templates/web/base/report/new/councils_text.html:3
+#: templates/web/base/report/new/councils_text.html:4
+msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
+msgstr "Estos serán publicados online para que otros los vean: de acuerdo con nuestra <a href=\"%s\">política de privacidad</a>."
+
+#: templates/web/base/report/new/councils_text_all.html:4
+#: templates/web/base/report/new/councils_text_all.html:6
+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 "Estos serán enviados a <strong>%s</strong> y también publicados online para que otros los vean, de acuerdo a nuestra <a href=\"%s\">política de privacidad</a>."
+
+#: templates/web/base/report/new/councils_text_private.html:5
+#: templates/web/base/report/new/form_user.html:4
+msgid "These will be sent to the council, but will never be shown online."
+msgstr "Estos serán enviados al ayuntamiento, pero nunca se mostrarán online."
+
+#: templates/web/base/report/new/councils_text_private.html:3
+msgid "These will never be shown online."
+msgstr "Estos nunca se mostrarán 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 "Esta implementación de la API es un trabajo aún en progreso y no es estable todavía. Se cambiará sin advertencias en el futuro."
+
+#: templates/web/base/admin/body.html:48
+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 ""
+"Este organismo no cubre ninguna zona. Esto significa que no tiene jurisdicción sobre los problemas reportados <em>en ninguna ubicación</ em>. \n"
+"En consecuencia, ninguna de sus categorías aparecerá en el menú desplegable de categorías cuando los usuarios envíen incidencias.\n"
+"Actualmente, los usuarios <strong>no pueden informar de problemas a este organismo</ strong>."
+
+#: templates/web/base/admin/body.html:58
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr "Este órgano no tiene contactos. Esto significa que en la actualidad las incidencias notificadas a este organismo <strong>no son enviadas</strong>."
+
+#: templates/web/base/admin/body-form.html:58
+#: templates/web/base/admin/body-form.html:59
+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 ""
+"A este organismo sólo se enviarán informes de problemas que se encuentran en el <strong>área cubierta</strong>.\n"
+"Un organismo no recibirá ningún informe salvo que represente al menos un área."
+
+#: perllib/FixMyStreet/Script/Reports.pm:201
+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 correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema."
+
+#: perllib/FixMyStreet/Script/Reports.pm:204
+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:874
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/Cobrand/UK.pm:44
+msgid "This information is required"
+msgstr "Esta información es necesaria"
+
+#: templates/web/base/debug_header.html:3
+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."
+
+#: templates/web/base/reports/index.html:10
+msgid "This is a summary of all reports on this site."
+msgstr "Este es un resumen de todos los informes en esta web."
+
+#: templates/web/base/report/new/form_report.html:56
+msgid "This pothole has been here for two months and…"
+msgstr "Este bache ha estado aquí dos meses y ..."
+
+#: templates/web/base/report/update/form_update.html:59
+msgid "This problem has been fixed"
+msgstr "Este problema se ha arreglado"
+
+#: templates/web/base/report/update/form_update.html:53
+msgid "This problem has not been fixed"
+msgstr "Este problema no se ha arreglado"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
+#: 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:101
+msgid "This report is currently marked as closed."
+msgstr "Esta notificación está marcada como cerrada."
+
+#: perllib/FixMyStreet/Script/Alerts.pm:99
+msgid "This report is currently marked as fixed."
+msgstr "Esta notificación está marcada como arreglada."
+
+#: perllib/FixMyStreet/Script/Alerts.pm:103
+msgid "This report is currently marked as open."
+msgstr "Esta notificación está marcada como abierta."
+
+#: perllib/FixMyStreet/Script/Reports.pm:109
+msgid "This report was submitted anonymously"
+msgstr "Esta notificación se ha presentado de forma anónima."
+
+#: perllib/FixMyStreet/Script/Reports.pm:89
+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:119
+#: templates/web/zurich/admin/report_edit-sdm.html:78
+#: templates/web/zurich/admin/report_edit.html:106
+#: templates/web/zurich/admin/report_edit.html:144
+msgid "Time spent (in minutes):"
+msgstr "Tiempo invertido (en minutos):"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:639
+#: templates/web/base/admin/timeline.html:1
+msgid "Timeline"
+msgstr "Cronología"
+
+#: templates/web/base/report/new/after_photo.html:1
+msgid "Tips for perfect photos"
+msgstr "Tips para fotos perfectas"
+
+#: templates/web/base/admin/flagged.html:15
+#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/reports.html:13
+#: templates/web/base/admin/templates.html:10
+msgid "Title"
+msgstr "Título"
+
+#: templates/web/base/admin/template_edit.html:13
+#: templates/web/zurich/admin/template_edit.html:20
+msgid "Title:"
+msgstr "Título:"
+
+#: templates/web/base/alert/index.html:25
+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:"
+
+#: templates/web/base/alert/index.html:27
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área"
+
+#: perllib/FixMyStreet/Script/Reports.pm:95
+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/admin/questionnaire.html:24
+#: templates/web/base/admin/stats.html:24
+#: templates/web/base/admin/stats.html:43
+#: templates/web/base/admin/stats_fix_rate.html:4
+#: templates/web/zurich/admin/stats.html:30
+msgid "Total"
+msgstr "Total"
+
+#: templates/web/base/report/_inspect.html:98
+msgid "Traffic management required?"
+msgstr "¿Se necesita administración del tráfico?"
+
+#: templates/web/base/admin/user-form.html:111
+msgid "Trusted by bodies:"
+msgstr "Confiables por los organismos administrativos:"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
+msgid "Trusted to make reports that don't need to be inspected"
+msgstr "Acreditado para hacer informes que no requieren inspección"
+
+#: templates/web/base/admin/user-form.html:119
+msgid "Trusted:"
+msgstr "Acreditado:"
+
+#: templates/web/base/js/translation_strings.html:29
+msgid "Try again"
+msgstr "Inténtelo de nuevo"
+
+#: templates/web/base/contact/submit.html:14
+msgid "Try emailing us directly:"
+msgstr "Pruebe enviándonos un correo directamente:"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "Unable to fix"
+msgstr "Incapaz de arreglarlo"
+
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/update_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:66
+#: templates/web/zurich/admin/report_edit.html:94
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr "Sin confirmar"
+
+#: templates/web/base/reports/_list-filters.html:3
+msgid "Unfixed reports"
+msgstr "Informes sin arreglar"
+
+#: templates/web/base/report/banner.html:9
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:174
+msgid "Unknown alert type"
+msgstr "Tipo de alerta desconocida"
+
+#: perllib/FixMyStreet/App/Controller/Auth.pm:530
+#: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: templates/web/base/js/translation_strings.html:38
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:115
+#: perllib/FixMyStreet/App/Controller/Report.pm:121
+#: perllib/FixMyStreet/App/Controller/Report.pm:124
+msgid "Unknown problem ID"
+msgstr "ID de problema desconocido"
+
+#: templates/web/base/report/update/form_update.html:29
+msgid "Update"
+msgstr "Actualizar"
+
+#: templates/web/base/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr "Actualización %s creada para el problema %d; por %s"
+
+#: templates/web/base/contact/index.html:28
+msgid "Update below added anonymously at %s"
+msgstr "La actualización de abajo fue añadida de forma anónima en %s"
+
+#: templates/web/base/contact/index.html:30
+msgid "Update below added by %s at %s"
+msgstr "La actualización de abajo fue añadida por %s en %s"
+
+#: templates/web/base/admin/body-form.html:138
+#: templates/web/zurich/admin/body-form.html:52
+msgid "Update body"
+msgstr "Actualizar órgano"
+
+#: templates/web/base/admin/stats_by_state.html:21
+msgid "Update breakdown by state"
+msgstr "Actualizar desglose por estado"
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr "Actualizar por {{name}}"
+
+#: templates/web/base/admin/update_edit.html:44
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr "La actualización modificó el estado del problema a %s"
+
+#: templates/web/base/admin/update_edit.html:46
+msgid "Update marked problem as fixed"
+msgstr "La actualización marcó el problema como arreglado"
+
+#: templates/web/base/admin/update_edit.html:48
+msgid "Update reopened problem"
+msgstr "La actualización reabrió el problema"
+
+#: templates/web/base/admin/body.html:110
+msgid "Update statuses"
+msgstr "Actualización de estados"
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Updated"
+msgstr "Actualizado"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
+#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:762
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:787
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:857
+msgid "Updated!"
+msgstr "¡Actualizado!"
+
+#: templates/web/base/admin/list_updates.html:2
+#: templates/web/base/report/update.html:5
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr "Actualizaciones"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+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."
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr "Actualizaciones en {{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 "Actualizaciones a este problema, %s"
+
+#: templates/web/base/admin/open311-form-fields.html:65
+msgid "Use Open311 update-sending extension"
+msgstr "Abrir la extension Open311 de envío de actualización"
+
+#: templates/web/base/admin/contact-form.html:124
+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 solo se muestran en el administrador.  Estas entradas no son públicas y no se enviarán al organismo administrativo."
+
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/report_edit.html:69
+msgid "Used map"
+msgstr "Mapa usado"
+
+#: templates/web/base/admin/open311-form-fields.html:78
+msgid "User ID to attribute fetched comments to"
+msgstr "ID de usuario a quien atribuir los comentarios obtenidos"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+msgid "User flag removed"
+msgstr "Eliminada marca de usuario"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+msgid "User flagged"
+msgstr "Usuario marcado"
+
+#: templates/web/base/admin/users.html:5
+msgid "User search finds matches in users' names and email addresses."
+msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email."
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:670
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:398
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
+msgid "Users"
+msgstr "Usuarios"
+
+#: templates/web/base/admin/user-form.html:149
+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. "
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:400
+#: perllib/FixMyStreet/App/Controller/Admin.pm:430
+#: perllib/FixMyStreet/App/Controller/Admin.pm:448
+msgid "Values updated"
+msgstr "Valores actualizados"
+
+#: templates/web/base/admin/report_edit.html:35
+#: templates/web/base/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:23
+#: templates/web/zurich/admin/report_edit.html:24
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr "Ver notificaciones en el site"
+
+#: templates/web/base/reports/body.html:14
+msgid "View reports by ward"
+msgstr "Ver notificaciones por barrio"
+
+#: templates/web/base/around/display_location.html:0
+#: templates/web/base/around/display_location.html:37
+msgid "Viewing a location"
+msgstr "Visualizando una ubicación"
+
+#: templates/web/base/report/display.html:0
+msgid "Viewing a problem"
+msgstr "Visualizando un problema"
+
+#: templates/web/base/reports/body.html:16
+msgid "Wards of this council"
+msgstr "Barrios de este ayuntamiento"
+
+#: templates/web/base/alert/choose.html:6
+#: templates/web/base/around/_error_multiple.html:6
+msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
+msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquí su ubicación."
+
+#: templates/web/base/around/lookup_by_ref.html:5
+msgid "We found more than one match for that problem reference:"
+msgstr "Hemos encontrado más de una coincidencia para el problema de referencia:"
+
+#: templates/web/base/auth/general.html:6
+#: 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 "Necesitamos su dirección de email, por favor escríbala debajo."
+
+#: perllib/FixMyStreet/Script/Reports.pm:210
+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 "Somos conscientes de este problema podría ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos."
+
+#: templates/web/base/index-steps.html:11
+msgid "We send it to the council on your behalf"
+msgstr "Se lo enviamos al Ayuntamiento en su nombre"
+
+#: 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=\"/privacy\">privacy policy.</a>"
+msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</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 "Lamentamos que el problema no esté arreglado. ¿Por qué no prueba a escribir directamente a sus representantes locales?"
+
+#: templates/web/base/contact/submit.html:7
+msgid "We’ll get back to you as soon as we can."
+msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!"
+
+#: templates/web/base/questionnaire/index.html:73
+msgid "What was your experience of getting the problem fixed?"
+msgstr "¿Cómo fue su experiencia durante el proceso de solución del problema?"
+
+#: templates/web/base/admin/category_edit.html:52
+#: templates/web/zurich/admin/body.html:18
+msgid "When edited"
+msgstr "Una vez editada"
+
+#: templates/web/base/admin/problem_row.html:35
+msgid "When sent"
+msgstr "Una vez enviada"
+
+#: templates/web/base/js/translation_strings.html:51
+msgid "Whoa there Testino! Three photos are enough."
+msgstr "¡Espere! Tres fotos son suficientes."
+
+#: templates/web/base/tokens/confirm_alert.html:7
+msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
+msgstr "¿Por qué detenerse ahí? <a href=\"/alert\">Configure más alertas</a> gratis."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:923
+#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:14
+msgid "Wish"
+msgstr "Deseo"
+
+#: 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 "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por <a href=\"%s\">MapIT</a>."
+
+#: templates/web/base/front/footer-marketing.html:17
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>."
+msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>."
+
+#: templates/web/base/questionnaire/index.html:101
+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?"
+
+#: 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 "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difícil de leer."
+
+#: templates/web/base/report/new/fill_in_details_form.html:4
+msgid "Wrong location? Just click again on the map."
+msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto."
+
+#: templates/web/base/admin/stats.html:10
+msgid "Year"
+msgstr "Año"
+
+#: templates/web/base/admin/bodies.html:70
+#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
+#: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
+#: templates/web/base/admin/category_edit.html:5
+#: templates/web/base/admin/flagged.html:47
+#: templates/web/base/admin/list_updates.html:32
+#: templates/web/base/admin/list_updates.html:34
+#: templates/web/base/admin/list_updates.html:35
+#: templates/web/base/admin/problem_row.html:20
+#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:95
+#: templates/web/base/admin/update_edit.html:25
+#: templates/web/base/admin/users.html:32
+#: templates/web/base/questionnaire/creator_fixed.html:14
+#: templates/web/base/questionnaire/index.html:104
+#: templates/web/base/questionnaire/index.html:53
+msgid "Yes"
+msgstr "SÍ"
+
+#: templates/web/base/report/new/form_user_loggedout_password.html:5
+#: templates/web/base/report/update/form_user_loggedout_password.html:4
+msgid "Yes I have a password"
+msgstr "Sí, tengo una contraseña"
+
+#: templates/web/base/contact/index.html:46
+msgid "You are complaining that this problem report was unnecessarily moderated:"
+msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:"
+
+#: templates/web/base/contact/index.html:48
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o  similar:"
+
+#: templates/web/base/contact/index.html:22
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:"
+
+#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:8
+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/user-form.html:96
+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."
+
+#: templates/web/base/contact/index.html:113
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr "Puede ponerse en contacto con el soporte técnico en <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 ""
+"Puede marcar cualquier informe o usuario y serán listado en esta página.\n"
+"Por ejemplo, si quiere tener vigilado a un usuario que envió algún informe\n"
+"inapropiado anteriormente."
+
+#: templates/web/base/report/new/top_message_none.html:12
+#: templates/web/base/report/new/top_message_none.html:14
+#: templates/web/base/report/new/top_message_some.html:11
+#: templates/web/base/report/new/top_message_some.html:9
+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 "Puede ayudarnos a encontrar una dirección de email de contacto para los problemas locales para %s y enviárnosla a <a href='mailto:%s'>%s</a>."
+
+#: templates/web/base/admin/body-form.html:91
+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."
+
+#: templates/web/base/js/translation_strings.html:35
+msgid "You declined; please fill in the box above"
+msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
+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/report/new/form_report.html:37
+#: 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 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:87
+#: 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 "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)."
+
+#: templates/web/base/auth/sign_out.html:4
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr "Ha cerrado la sesión correctamente"
+
+#: 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 "Has ubicado el problema en el punto marcado con el pin verde en el mapa. Si este no es el lugar correcto, simplemente haga clic en el mapa de nuevo. "
+
+#: templates/web/base/auth/change_email.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr "Ha confirmado correctamente su dirección de correo electrónico."
+
+#: 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 "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son correctos:"
+
+#: templates/web/base/my/my.html:31
+msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a problem now.</a>"
+msgstr "No ha notificado nada aún. <a href=\"%s\">Notifique un problema ahora</a>."
+
+#: templates/web/base/my/planned.html:21
+msgid "You haven&rsquo;t shortlisted any reports yet."
+msgstr "No ha&rsquo; pre-seleccionado ningún informe aú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."
+msgstr "Necesita <a href=\"%s\">añadir organismos</a> (como ayuntamiento o departamentos) para que el informe pueda ser enviado."
+
+#: templates/web/base/admin/bodies.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 ""
+"Es necesario crear organismos (como ayuntamientos o departamentos) para poder añadir\n"
+"categorías de problemas que éstos puedan solucionar (como farolas o baches) y su\n"
+"vía de contacto (como una dirección de correo), para que las notificaciones puedan ser enviadas."
+
+#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:5
+msgid "Your Reports"
+msgstr "Sus notificaciones"
+
+#: templates/web/base/auth/change_password.html:11
+#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+msgid "Your account"
+msgstr "Su cuenta"
+
+#: templates/web/base/alert/_list.html:90
+#: templates/web/base/alert/updates.html:19
+#: templates/web/base/alert/updates.html:22
+#: templates/web/base/contact/index.html:83
+#: templates/web/base/report/display_tools.html:44
+#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/report/new/form_user_loggedout_email.html:1
+#: templates/web/base/report/update/form_user_loggedout_email.html:1
+#: templates/web/zurich/report/new/fill_in_details_form.html:53
+msgid "Your email"
+msgstr "Su email:"
+
+#: templates/web/base/auth/change_email.html:9
+#: templates/web/base/auth/general.html:55
+#: templates/web/base/report/update/form_user_loggedout_email.html:5
+#: templates/web/zurich/auth/general.html:30
+#: templates/web/zurich/auth/general.html:58
+msgid "Your email address"
+msgstr "Su dirección de email"
+
+#: templates/web/base/report/updates-sidebar-notes.html:3
+msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
+msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>"
+
+#: templates/web/base/auth/general.html:107
+#: templates/web/base/contact/index.html:76
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:17
+#: templates/web/base/report/update/form_name.html:29
+#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/report/new/fill_in_details_form.html:63
+msgid "Your name"
+msgstr "Su nombre"
+
+#: templates/web/base/auth/general.html:85
+#: templates/web/base/report/new/form_user_loggedout_password.html:10
+#: templates/web/base/report/update/form_user_loggedout_password.html:9
+#: templates/web/zurich/auth/general.html:34
+msgid "Your password"
+msgstr "Su contraseña"
+
+#: templates/web/base/auth/change_password.html:10
+msgid "Your password has been changed"
+msgstr "Su contraseña ha cambiado"
+
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
+#: templates/web/zurich/report/new/fill_in_details_form.html:69
+msgid "Your phone number"
+msgstr "Su número de teléfono"
+
+#: templates/web/base/questionnaire/index.html:16
+msgid "Your report"
+msgstr "Su informe"
+
+#: templates/web/base/my/my.html:28
+msgid "Your reports"
+msgstr "Sus notificaciones"
+
+#: 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 "Sus pre-seleccionados"
+
+#: templates/web/base/my/my.html:51
+msgid "Your updates"
+msgstr "Sus actualizaciones"
+
+#: templates/web/base/report/new/form_user_loggedin.html:18
+#: templates/web/base/report/update/form_name.html:11
+msgid "Yourself"
+msgstr "Usted mismo"
+
+#: templates/web/base/admin/category-checkboxes.html:7
+#: templates/web/base/admin/user-form.html:159
+msgid "all"
+msgstr "todo"
+
+#: templates/web/base/admin/timeline.html:4
+msgid "by %s"
+msgstr "por %s"
+
+#: templates/web/base/reports/body.html:6
+#: templates/web/base/reports/body.html:7
+msgid "council"
+msgstr "ayuntamiento"
+
+#: templates/web/base/admin/report_edit.html:52
+msgid "didn't use map"
+msgstr "no utilizó mapa"
+
+#: templates/web/base/alert/index.html:33
+#: templates/web/base/around/postcode_form.html:12
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr "por ejemplo, '%s' o '%s'"
+
+#: templates/web/base/admin/flagged.html:51
+#: templates/web/base/admin/open311-form-fields.html:81
+msgid "edit user"
+msgstr "editar usuario"
+
+#: templates/web/base/status/stats.html:20
+#: templates/web/zurich/admin/index.html:5
+msgid "from %s different users"
+msgstr "de %s usuarios diferentes"
+
+#: templates/web/base/report/_item.html:15
+#: templates/web/zurich/report/_item.html:14
+msgid "last updated %s"
+msgstr "ultima actualización %s"
+
+#: perllib/Utils.pm:205
+msgid "less than a minute"
+msgstr "menos de un minuto"
+
+#: templates/web/base/report/updates.html:57
+msgid "marked as a duplicate report"
+msgstr "marcado como un informe duplicado"
+
+#: templates/web/base/report/updates.html:47
+msgid "marked as action scheduled"
+msgstr "marcado como acción programada"
+
+#: templates/web/base/report/updates.html:59
+msgid "marked as an internal referral"
+msgstr "marcado como una referencia interna"
+
+#: templates/web/base/report/updates.html:49
+msgid "marked as closed"
+msgstr "marcado como cerrado"
+
+#: templates/web/base/report/updates.html:28
+#: templates/web/base/report/updates.html:51
+msgid "marked as fixed"
+msgstr "marcado como arreglado"
+
+#: templates/web/base/report/updates.html:45
+msgid "marked as in progress"
+msgstr "marcado como en progreso"
+
+#: templates/web/base/report/updates.html:41
+msgid "marked as investigating"
+msgstr "marcado como en investigación"
+
+#: templates/web/base/report/updates.html:55
+msgid "marked as not the council's responsibility"
+msgstr "marcado como que el ayuntamiento no es responsable"
+
+#: templates/web/base/report/updates.html:43
+msgid "marked as planned"
+msgstr "marcado como planificado"
+
+#: templates/web/base/report/updates.html:53
+msgid "marked as unable to fix"
+msgstr "marcado como que no se puede arreglar"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:122
+#: templates/web/base/admin/questionnaire.html:15
+#: templates/web/base/admin/questionnaire.html:16
+msgid "n/a"
+msgstr "n/a"
+
+#: templates/web/base/admin/category-checkboxes.html:8
+#: templates/web/base/admin/user-form.html:160
+msgid "none"
+msgstr "nada"
+
+#: templates/web/base/admin/category_edit.html:35
+msgid "optional"
+msgstr "opcional"
+
+#: templates/web/base/alert/_list.html:86
+msgid "or"
+msgstr "o"
+
+#: templates/web/base/js/translation_strings.html:27
+msgid "or locate me automatically"
+msgstr "o localízame automáticamente"
+
+#: templates/web/base/admin/report_edit.html:48
+#: templates/web/base/admin/report_edit.html:50
+#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:34
+#: templates/web/zurich/admin/report_edit-sdm.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:57
+#: templates/web/zurich/admin/report_edit.html:34
+#: templates/web/zurich/admin/report_edit.html:36
+#: templates/web/zurich/admin/report_edit.html:50
+#: templates/web/zurich/admin/report_edit.html:52
+#: templates/web/zurich/admin/report_edit.html:74
+#: templates/web/zurich/admin/report_edit.html:76
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr "consignados inicialmente:"
+
+#: templates/web/base/admin/report_edit.html:68
+msgid "other areas:"
+msgstr "otras áreas:"
+
+#: templates/web/base/report/updates.html:29
+#: templates/web/base/report/updates.html:39
+msgid "reopened"
+msgstr "reabierto"
+
+#: templates/web/base/admin/category_edit.html:35
+msgid "required"
+msgstr "requerido"
+
+#: templates/web/zurich/footer.html:13
+msgid "sign out"
+msgstr "salir"
+
+#: templates/web/base/report/new/form_report.html:13
+msgid "the local council"
+msgstr "ayuntamiento"
+
+#: templates/web/base/report/_report_meta_info.html:2
+#: templates/web/zurich/report/_main.html:5
+msgid "there is no pin shown as the user did not use the map"
+msgstr "no hay marcador porque el usuario no usó el mapa"
+
+#: perllib/FixMyStreet/Script/Reports.pm:186
+msgid "this type of local problem"
+msgstr "este tipo de problema local"
+
+#: perllib/Utils.pm:177
+msgid "today"
+msgstr "hoy"
+
+#: templates/web/base/admin/report_edit.html:52
+msgid "used map"
+msgstr "mapa utilizado"
+
+#: templates/web/base/admin/update_edit.html:37
+msgid "user is from same council as problem - %d"
+msgstr "El usuario es del mismo ayuntamiento que el problema - %d"
+
+#: templates/web/base/admin/update_edit.html:40
+msgid "user is problem owner"
+msgstr "El usuario es el propietario del problema"
+
+#: templates/web/base/reports/body.html:0
+#: templates/web/base/reports/body.html:3
+msgid "ward"
+msgstr "barrio"
+
+#: 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"
+
+#: perllib/Utils.pm:224
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
+
+#: templates/web/base/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d simpatizante"
+msgstr[1] "%d simpatizantes"
+
+#: perllib/Utils.pm:226
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: 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] "<big>%s</big> notificaciones actualizadas"
+msgstr[1] "<big>%s</big> notificaciones actualizadas"
+
+#: 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
+msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
+
+#: perllib/Utils.pm:220
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semana"
+msgstr[1] "%d semanas"
+
+#: 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/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] "<big>%s</big> arregladas la semana pasada"
+msgstr[1] "<big>%s</big> arregladas el mes pasado"
+
+#: perllib/Utils.pm:222
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
+
+#: 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] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
+msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área."
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index eb20be8e4..efdaf61b4 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -43,7 +43,7 @@ msgstr "de %d à %d de %d"
 #: templates/web/base/reports/body.html:0
 #: templates/web/base/reports/body.html:24
 msgid "%s - Summary reports"
-msgstr "%s - Rapports sommaires"
+msgstr "%s - Rapports résumés"
 
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
@@ -107,10 +107,10 @@ msgid ""
 "council&rsquo;s alerts, but will only appear in the \"Within the boundary\" alert\n"
 "for the county council."
 msgstr ""
-"%s envoie différentes catégories de problème\n"
-"a l'administration appropriée. Les problèmes à la limite d'une administration\n"
-"pourraient ne pas correspondre aux problèmes envoyés à cette administration. Par exemple, un rapport\n"
-" graffiti sera envoyé a l'administration de district, et apparaîtrait dans les deux administrations."
+"%s envoie différentes catégories de problèmes \n"
+"à l'administration appropriée. Les problèmes situés sur le territoire d'une administration pourraient ne pas correspondre aux problèmes envoyés à cette administration.\n"
+" Par exemple, un rapport graffiti sera envoyé à l'administration\n"
+" de district, et apparaîtrait dans les deux administrations."
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
 msgid "%s ward, %s"
@@ -145,7 +145,7 @@ msgstr "(Sans numéro de téléphone)"
 
 #: templates/web/base/alert/_list.html:25
 msgid "(a default distance which covers roughly 200,000 people)"
-msgstr "(une distance par défaut qui couvre environs 200 000 personnes)"
+msgstr "(une distance par défaut qui couvre environ 200 000 personnes)"
 
 #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
 #: templates/web/base/alert/_list.html:30
@@ -194,7 +194,7 @@ msgstr "--Choisissez un modèle--"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
-msgstr "Nid de poule de 10cm prés de la boîte postale"
+msgstr "Nid de poule de 10cm près de la boîte postale"
 
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
@@ -341,8 +341,7 @@ msgstr "Toutes catégories"
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Tous les rapports"
@@ -397,7 +396,7 @@ msgstr "Région:"
 #: templates/web/base/admin/bodies.html:19
 #: templates/web/base/admin/body.html:64
 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 "Comme ceci est un site de développement et %s est un test, les rapports produits sur ce site seront envoyés au gestionnaire du problème FixMyStreet et non le contact de l'administration indiqué pour la catégorie choisie."
+msgstr "Comme ceci est un site de développement et %s est un test, les rapports produits sur ce site seront envoyés au gestionnaire du problème FixMyStreet et non au contact de l'administration indiqué pour la catégorie choisie."
 
 #: templates/web/zurich/admin/report_edit.html:209
 msgid "Assign to competent body:"
@@ -435,7 +434,7 @@ msgstr "Pour le moment, seul la recherche et la consultation de rapports sont su
 #: templates/web/base/admin/user-form.html:78
 #: templates/web/base/admin/user-form.html:79
 msgid "Authorised staff users can be associated with the categories in which they operate."
-msgstr ""
+msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur lesquelles ils interviennent."
 
 #: templates/web/base/admin/template_edit.html:22
 msgid "Auto-response:"
@@ -453,7 +452,7 @@ msgstr "Évitez les renseignements personnels et les plaques d'immatriculation"
 #: perllib/FixMyStreet/DB/Result/Problem.pm:401
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
-msgstr "Attendant une modération"
+msgstr "En attente de modération"
 
 #: templates/web/base/js/translation_strings.html:31
 msgid "Back"
@@ -1131,7 +1130,7 @@ msgstr "Catégorie existante"
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
-msgstr "Expliquez ce qui est erroné"
+msgstr "Expliquez le problème"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
@@ -1366,7 +1365,7 @@ msgstr "Caché(s)"
 
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
-msgstr "Cachés anciens"
+msgstr "Cacher les anciens"
 
 #: templates/web/base/around/display_location.html:62
 msgid "Hide pins"
@@ -1620,9 +1619,8 @@ msgid "Last&nbsp;update:"
 msgstr "Dernière&nbsp;actualisation :"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Dernière actualisation :"
+msgstr "Moins récemment mis à jour"
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1637,10 +1635,9 @@ msgid "Loading..."
 msgstr "Chargement…"
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Flux RSS et alertes email locaux"
@@ -1732,7 +1729,7 @@ msgstr "Mois"
 
 #: templates/web/base/reports/_list-filters.html:39
 msgid "Most commented"
-msgstr ""
+msgstr "Les plus commentés"
 
 #: templates/web/base/admin/bodies.html:25
 #: templates/web/base/admin/body-form.html:24
@@ -1870,7 +1867,7 @@ msgstr "Nouveau modèle"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
-msgstr ""
+msgstr "Plus récents"
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
@@ -2052,7 +2049,7 @@ msgstr "Anciens <br />problèmes"
 
 #: templates/web/base/reports/_list-filters.html:36
 msgid "Oldest"
-msgstr ""
+msgstr "Plus anciens"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
@@ -2257,8 +2254,7 @@ msgid "Please choose a property type"
 msgstr "Merci de choisir un type de propriété"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Merci de corriger les erreurs ci-dessous"
 
@@ -2714,9 +2710,8 @@ msgid "Recently reported problems"
 msgstr "Problèmes signalés récemment"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Recevoir les mises à jour"
+msgstr "Récemment mis à jour"
 
 #: 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."
@@ -2981,8 +2976,7 @@ msgstr "Sauvegardez avec une mise à jour publique"
 msgid "Search Reports"
 msgstr "Rechercher rapports"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Rechercher les utilisateurs"
 
@@ -3175,7 +3169,7 @@ msgstr "Désolé, vous n'êtes pas autorisé à faire cette action."
 
 #: templates/web/base/reports/_list-filters.html:33
 msgid "Sort by"
-msgstr ""
+msgstr "Trier par"
 
 #: templates/web/base/admin/user-form.html:47
 msgid "Staff users have permission to log in to the admin."
@@ -3210,8 +3204,7 @@ msgstr "État actuel :"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3302,8 +3295,7 @@ msgstr "Résumez vos modifications"
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3936,8 +3928,7 @@ msgstr "La recherche utilisateurs parcourt les noms et adresses courriel."
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Utilisateurs"
 
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
index d92aadf78..9c3a39a93 100644
--- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Guy Koth <guykoth@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Hebrew (Israel) (http://www.transifex.com/mysociety/fixmystreet/language/he_IL/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -326,8 +325,7 @@ msgstr ""
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr ""
@@ -445,9 +443,8 @@ msgid "Back"
 msgstr ""
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "צור דו\"ח"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -491,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "קטגוריה"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "קטגוריה"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -542,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "כתובת דואר אלקטרוני:"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -632,9 +626,8 @@ msgid "Closed by council"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "צור דו\"ח"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -765,9 +758,8 @@ msgid "Create category"
 msgstr "צור קטגוריה"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "צור דו\"ח"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "Create reports/updates as the council"
@@ -839,9 +831,8 @@ msgid "Description"
 msgstr "תיאור"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "תיאור"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -928,27 +919,24 @@ msgid "Edit body details"
 msgstr "ערוך פרטי גוף"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "ערוך פרטי גוף"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "צור קטגוריה"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "עורך"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -992,9 +980,8 @@ msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרע
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "כתובת דואר אלקטרוני:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1099,9 +1086,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "צור קטגוריה"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1136,9 +1122,8 @@ msgid "Extra data:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "ערוך פרטי גוף"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1602,10 +1587,9 @@ msgid "Loading..."
 msgstr ""
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 ""
@@ -1680,14 +1664,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "ערוך פרטי גוף"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "צור דו\"ח"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1774,9 +1756,8 @@ msgid "New category contact added"
 msgstr ""
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "כתובת דואר אלקטרוני:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1792,9 +1773,8 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "החלף ססמא"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
@@ -2216,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2936,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3163,8 +3141,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3255,8 +3232,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3869,8 +3845,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
@@ -4127,9 +4102,8 @@ msgstr ""
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "אשר חשבון"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index bd52835e3..e56d48f6e 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Antonia Banović <antonia.banovic@gmail.com>, 2013
-# Bojan Opacak <bojan@rationalinternational.net>, 2012
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Croatian (http://www.transifex.com/mysociety/fixmystreet/language/hr/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -276,9 +274,8 @@ msgid "Add user"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Dodaj novu kategoriju"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -322,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Sve Prijave"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Sve prijave"
@@ -369,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Jeste li programer?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -449,9 +443,8 @@ msgid "Back"
 msgstr ""
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Sve prijave"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -495,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategorija"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategorija:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -519,9 +510,8 @@ msgid "Category"
 msgstr "Kategorija"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "npr. ‘%s’ ili‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -547,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Onemogući e-mail adrese"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -637,9 +626,8 @@ msgid "Closed by council"
 msgstr "Zatvorilo je odgovorno tijelo"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Ponovno pošalji prijavu"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -770,14 +758,12 @@ msgid "Create category"
 msgstr "Kreiraj kategoriju"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Kreiraj izvješće"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Nije prijavljeno odgovornom tijelu"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -933,28 +919,24 @@ msgid "Edit body details"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Unesi detalje"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Kreiraj kategoriju"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Pogledaj prijave na stranici"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Sve prijave"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -998,9 +980,8 @@ msgstr "E-mail dodan na listu zloupotrebe"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Onemogući e-mail adrese"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1105,9 +1086,8 @@ msgstr "Primjeri:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Kreiraj kategoriju"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1142,9 +1122,8 @@ msgid "Extra data:"
 msgstr "Dodatni podaci:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Dodatni podaci:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1186,9 +1165,8 @@ msgid "Fixed - User"
 msgstr "Popravljeno - Korisnik"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Ponovno pošalji prijavu"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1423,9 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Ako iznesete problem ovdje sadržaj i detalji problema bit će javni, ali će problem <strong>not</strong> biti prijavljen vijeću."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1594,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Posljednje&nbsp;ažuriranje:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Posljednje ažuriranje"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1611,10 +1587,9 @@ msgid "Loading..."
 msgstr "Učitavanje"
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokalni RSS izvori i e-mail upozorenja"
@@ -1693,9 +1668,8 @@ msgid "Moderate report details"
 msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Kreiraj izvješće"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1742,9 +1716,8 @@ msgid "Name: %s"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS izvor za ažuriranja ovog problema"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1785,9 +1758,8 @@ msgid "New category contact added"
 msgstr "Novi kontakt dodan u kategoriju"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Onemogući e-mail adrese"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1803,9 +1775,8 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Lozinka:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
@@ -1871,9 +1842,8 @@ msgid "No"
 msgstr "Ne"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "druga područja:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2056,9 +2026,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API za Popravi.to server"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311 specifikacija"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2174,9 +2143,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Slika"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2230,8 +2198,7 @@ msgid "Please choose a property type"
 msgstr "Izaberi tip imovine"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2258,9 +2225,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Unesi lozinku"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2386,9 +2352,8 @@ msgid "Please note:"
 msgstr "Napominjemo:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2565,9 +2530,8 @@ msgid "Provide an update"
 msgstr "Ažuriranje"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Ažuriranje"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2584,9 +2548,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s ažuriranje uživo"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2688,9 +2651,8 @@ msgid "Recently reported problems"
 msgstr "Nedavno prijavljeni problemi"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Primite ažuriranja"
+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."
@@ -2725,9 +2687,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Prijavi zloupotrebu"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2740,9 +2701,8 @@ msgid "Report abuse"
 msgstr "Prijavi zloupotrebu"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Prijavi zloupotrebu"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2957,8 +2917,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Pretraži prijave"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Pretraži korisnike"
 
@@ -3004,9 +2963,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Predmet:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3050,9 +3008,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Objavio %s na %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3186,8 +3143,7 @@ msgstr "Stanje:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3268,20 +3224,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Pretplati se na e-mail upozorenja"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Unesi detalje o problemu"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Pošalji promjene"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3568,15 +3521,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Vaše privatne podatke koristimo u skladu s našim <a href=\"/privacy\">pravilima o privatnosti.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Vaše privatne podatke koristimo u skladu s našim <a href=\"/privacy\">pravilima o privatnosti.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3731,9 +3682,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Kreirano:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3760,9 +3710,8 @@ msgid "Unconfirmed"
 msgstr "Nepotvrđeno"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Ponovno pošalji prijavu"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3898,8 +3847,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Korisnici"
 
@@ -4156,9 +4104,8 @@ msgstr "Vaše prijave"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Potvrdi račun"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4219,9 +4166,8 @@ msgstr "Vaše prijave"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Vaše prijave"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4229,9 +4175,8 @@ msgstr "Vaša ažuriranja"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Vaš e-mail"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4328,9 +4273,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(nije obavezno)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4493,24 +4437,3 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] "Još <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje je odgovorno za ovu lokaciju."
 msgstr[1] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
 msgstr[2] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Sve unešene informacije bit će poslane na"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Sve informacije koje nam dostavite bit će proslijeđene <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Konfiguriraj Endpoint"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS na Google Mapama"
-
-#~ msgid "We never show your email"
-#~ msgstr "Nikada ne prikazujemo vašu e-mail adresu"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Nikada ne prikazujemo vašu e-mail adresu ili telefonski broj."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Jeste li sigurni da želite ponovno poslati?"
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
index 5def7d406..d743e11f9 100644
--- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# claudio <claudio_carletti@hotmail.it>, 2013
-# Giuseppe Pignataro <rogepix@gmail.com>, 2015
-# marcopas <passantemarco@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Italian (http://www.transifex.com/mysociety/fixmystreet/language/it/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,9 +274,8 @@ msgid "Add user"
 msgstr "Aggiungi un'utente"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Aggiungi una nuova categoria"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -323,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Tutte le segnalazioni"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Tutte le segnalazioni"
@@ -357,9 +351,8 @@ msgstr "Anonimo:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Aggiungi un'utente"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -371,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Sei uno sviluppatore?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -408,9 +400,8 @@ msgid "Assign to subdivision:"
 msgstr "Assegna ad una subdivisione:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Assegnato a %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -430,9 +421,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Risposte pubbliche:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -453,9 +443,8 @@ msgid "Back"
 msgstr "Indietro"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Tutte le segnalazioni"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -499,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Categoria"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Categoria:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -550,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Vietare l'indirizzo email"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -640,9 +626,8 @@ msgid "Closed by council"
 msgstr "Chiuso dal comune"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Rinvia la segnalazione"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -773,14 +758,12 @@ msgid "Create category"
 msgstr "Crea una categoria"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Crea una segnalazione"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Non segnalato al comune"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -848,9 +831,8 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Descrizione"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -937,27 +919,24 @@ msgid "Edit body details"
 msgstr "Modifica dettagli corpo"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Modifica dettagli corpo"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Crea una categoria"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Tutte le segnalazioni"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1001,9 +980,8 @@ msgstr "Email aggiunta alla lista abusi"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Indirizzo email:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1108,9 +1086,8 @@ msgstr "Esempi:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Crea una categoria"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1132,9 +1109,8 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Assegna ad un corpo esterno:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
 msgid "External team"
@@ -1146,9 +1122,8 @@ msgid "Extra data:"
 msgstr "Dati extra:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Dati extra:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1190,9 +1165,8 @@ msgid "Fixed - User"
 msgstr "Risolto - Utente"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Rinvia la segnalazione"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1427,9 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Se invii un problema qui, il soggetto e i dettagli del problema saranno pubblici ma il problema <strong>non</strong> verrà segnalato al comune."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1598,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Ultimo&nbsp;aggiornamento:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Ultimo aggiornamento:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1615,10 +1587,9 @@ msgid "Loading..."
 msgstr "Caricando..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "RSS feed locali ed avvertimenti via email"
@@ -1693,14 +1664,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Modifica dettagli corpo"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Crea una segnalazione"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1747,9 +1716,8 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS feed degli aggiornamenti su questa segnalazione"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1788,9 +1756,8 @@ msgid "New category contact added"
 msgstr "Nuova categoria contatto aggiunta"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Indirizzo email:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1806,9 +1773,8 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Password:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
@@ -1874,9 +1840,8 @@ msgid "No"
 msgstr "No"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "altre aree:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2176,9 +2141,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2232,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr "Per favore scegli un tipo di proprietà"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2260,9 +2223,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Per favore inserisci la password"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2388,9 +2350,8 @@ msgid "Please note:"
 msgstr "Attenzione:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2567,9 +2528,8 @@ msgid "Provide an update"
 msgstr "Fornisci un'aggiornamento"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Fornisci un'aggiornamento"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2586,9 +2546,8 @@ msgid "Public response:"
 msgstr "Risposte pubbliche:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Risposte pubbliche:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2690,9 +2649,8 @@ msgid "Recently reported problems"
 msgstr "Problemi segnalati di recente"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Ottieni aggiornamenti "
+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."
@@ -2727,9 +2685,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Segnala un abuso"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2742,9 +2699,8 @@ msgid "Report abuse"
 msgstr "Segnala un abuso"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Segnala un abuso"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2854,9 +2810,8 @@ msgid "Reports published"
 msgstr "Segnalazioni pubblicate"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Segnalazioni in attesa di approvazione"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2960,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Ricerca Segnalazioni"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Ricerca Utenti"
 
@@ -3007,9 +2961,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Soggetto:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3053,9 +3006,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Postato da %s al %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3189,8 +3141,7 @@ msgstr "Stato:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3271,20 +3222,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Iscrivimi alle email di avviso"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Inserisci i dettagli del problema"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Invia modifiche"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3571,15 +3519,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Useremo le tue informazioni personali solo in accordo con la nostra  <a href=\"/faq#privacy\">politica sulla privacy.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Useremo le tue informazioni personali solo in accordo con la nostra  <a href=\"/faq#privacy\">politica sulla privacy.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3734,9 +3680,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Creato:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3763,9 +3708,8 @@ msgid "Unconfirmed"
 msgstr "Non confermato"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Rinvia la segnalazione"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3901,8 +3845,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Utenti"
 
@@ -4159,9 +4102,8 @@ msgstr "Tue segnalazioni"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Conferma l'account"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4222,9 +4164,8 @@ msgstr "Tue segnalazioni"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Tue segnalazioni"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4232,9 +4173,8 @@ msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "La tua email"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4331,9 +4271,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(opzionale)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4485,24 +4424,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona."
 msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona."
-
-#~ msgid "(public)"
-#~ msgstr "(pubblico)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Tutte le informazioni che aggiungi qui, saranno inviate all'ufficio competente del comune di "
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Tutte le informazioni che aggiungi qui saranno inviate al <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Configura il punto finale"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS su Google Maps"
-
-#~ msgid "Survey"
-#~ msgstr "Sondaggio"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono."
diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
index 3da8594d8..737e89639 100644
--- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Saimonas <saimonas.skurichinas@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/mysociety/fixmystreet/language/lt_LT/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Paulius Zaleckas <paulius.zaleckas@gmail.com>, 2017\n"
+"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n"
 "Language: lt_LT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +48,7 @@ msgstr "%s - Suvestinės ataskaitos"
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
 msgid "%s admin:"
-msgstr ""
+msgstr "%s administravimas:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
@@ -127,12 +126,12 @@ msgstr "(Elektroninis paštas piktnaudžiavo lentelėje)"
 #: templates/web/zurich/admin/report_edit-sdm.html:62
 #: templates/web/zurich/admin/report_edit.html:90
 msgid "(No name)"
-msgstr ""
+msgstr "(Nėra vardo)"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:69
 #: templates/web/zurich/admin/report_edit.html:97
 msgid "(No phone number)"
-msgstr ""
+msgstr "(Nėra telefono numerio)"
 
 #: templates/web/base/alert/_list.html:25
 msgid "(a default distance which covers roughly 200,000 people)"
@@ -181,7 +180,7 @@ msgstr "-- Pasirinkite nuosavybės tipą --"
 
 #: templates/web/base/admin/response_templates_select.html:4
 msgid "--Choose a template--"
-msgstr ""
+msgstr "--Išsirinkinte šabloną--"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -224,11 +223,11 @@ msgstr "<strong>Ne</strong> leisti man prisijungti el. paštu"
 
 #: templates/web/base/report/_inspect.html:133
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
-msgstr ""
+msgstr "<strong>Pastaba:</strong> Šis pranešimas jau išsiūstas vykdymui. Bet kokie pakeitimai nebus perduoti."
 
 #: templates/web/base/report/_inspect.html:135
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
-msgstr ""
+msgstr "<strong>Pastaba:</strong> Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti."
 
 #: templates/web/base/auth/general.html:80
 #: templates/web/base/report/new/form_user_loggedout_password.html:3
@@ -273,7 +272,7 @@ msgstr "Pridėti naują kategoriją"
 #: templates/web/base/report/_main.html:19
 #: templates/web/base/report/_main.html:27
 msgid "Add to shortlist"
-msgstr ""
+msgstr "Įdėti į trumpajį sąrašą"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
@@ -281,17 +280,16 @@ msgid "Add user"
 msgstr "Pridėti vartotoją"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Pridėti naują kategoriją"
+msgstr "Pridėti/redaguoti problemų kategorijas"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
-msgstr ""
+msgstr "Pridėti/redaguoti atsakymų prioritetus"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
-msgstr ""
+msgstr "Pridėti/redaguoti atsakymo šablonus"
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -327,15 +325,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Visi Pranešimai"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Visi pranešimai"
@@ -361,9 +357,8 @@ msgstr "Anoniminis:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Pridėti vartotoją"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -375,9 +370,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Ar esi aplikacijų kūrėjas?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -412,9 +406,8 @@ msgid "Assign to subdivision:"
 msgstr "Priskirti padaliniui:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Priskirta to %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -434,9 +427,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Viešas atsakymas:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -457,9 +449,8 @@ msgid "Back"
 msgstr "Atgal"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Visi pranešimai"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -503,14 +494,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategorija"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategorija:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -554,9 +543,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Drausti el. paštą"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -657,9 +645,8 @@ msgid "Closed by council"
 msgstr "Uždaryta "
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Visi pranešimai"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -790,14 +777,12 @@ msgid "Create category"
 msgstr "Sukurti kategoriją"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Sukurti pranešimą"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Nepranešta savivaldybei"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -806,7 +791,7 @@ msgstr ""
 #: templates/web/base/admin/template_edit.html:36
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
-msgstr ""
+msgstr "Sukurti šabloną"
 
 #: templates/web/base/admin/problem_row.html:34
 #: templates/web/base/admin/templates.html:12
@@ -847,7 +832,7 @@ msgstr "Padalinys atliko per 5 darbo dienas"
 #: templates/web/base/admin/template_edit.html:40
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
-msgstr ""
+msgstr "Pašalinti šabloną"
 
 #: templates/web/base/admin/bodies.html:31
 #: templates/web/base/admin/body.html:87
@@ -865,9 +850,8 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Aprašymas"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -957,28 +941,24 @@ msgid "Edit body details"
 msgstr "Redaguoti institucijos informaciją"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Redaguoti institucijos informaciją"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Sukurti kategoriją"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtruoti pranešimo sąraša"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Visi pranešimai"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1022,9 +1002,8 @@ msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "El. pašto adresas:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1136,9 +1115,8 @@ msgstr "Pavyzdžiai:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Sukurti kategoriją"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1160,14 +1138,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Priskirti išoriniai institucijai:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Internal notes"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1175,9 +1151,8 @@ msgid "Extra data:"
 msgstr "Papildoma informacija:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Papildoma informacija:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1219,9 +1194,8 @@ msgid "Fixed - User"
 msgstr "Sutvarkyta - Vartotojas"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Nauji pranešimai"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1456,13 +1430,12 @@ msgstr ""
 
 #: templates/web/base/admin/template_edit.html:29
 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 ""
+msgstr "Jei norite, kad šis šablonas būtų naudojamas tik tam tikroms kategorijoms, pasirinkite jas čia. Pagal nutylėjimą jis bus rodomas visoms kategorijoms."
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Jeigu jūs patalpinsite problema čia, tada problemos tema ir informacija taps viešai prieinama, tačiau <strong>nebus</strong> išsiųsta į savivaldybę."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1639,9 +1612,8 @@ msgid "Last&nbsp;update:"
 msgstr "Last&nbsp;update:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Paskutinis atnaujinimas:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1656,10 +1628,9 @@ msgid "Loading..."
 msgstr "Kraunama..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Vietiniai RSS srautai ir el. pašto pranešimai"
@@ -1734,14 +1705,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Pridėti siuntėjo asmeninę informacija"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Sukurti pranešimą"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1788,9 +1757,8 @@ msgid "Name: %s"
 msgstr "Vardas: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "įveskite problemos detales"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1831,9 +1799,8 @@ msgid "New category contact added"
 msgstr "Naujas kategorijos kontaktas pridetas"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "El. pašto adresas:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1849,15 +1816,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Slaptažodis:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Nauji pranešimai"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1891,7 +1856,7 @@ msgstr "New state"
 #: templates/web/base/admin/templates.html:28
 #: templates/web/zurich/admin/template_edit.html:9
 msgid "New template"
-msgstr ""
+msgstr "Naujas šablonas"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
@@ -1976,15 +1941,10 @@ msgstr "Nė vienas"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"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."
 
 #: templates/web/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2113,9 +2073,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API for the mySociety FixMyStreet server"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311 specification"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2231,9 +2190,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Nuotrauka"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2287,8 +2245,7 @@ msgid "Please choose a property type"
 msgstr "Prašome pasirinkti nuosavybės tipą"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Prašome ištaisyti klaidas "
 
@@ -2315,9 +2272,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Prašome įvesti slaptažodį"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2443,9 +2399,8 @@ msgid "Please note:"
 msgstr "Atkreipkite dėmėsį:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2622,9 +2577,8 @@ msgid "Provide an update"
 msgstr "Pateikti naujinimą"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Pateikti naujinimą"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2641,9 +2595,8 @@ msgid "Public response:"
 msgstr "Viešas atsakymas:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Viešas atsakymas:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2745,9 +2698,8 @@ msgid "Recently reported problems"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Gauti atnaujinimus"
+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."
@@ -2796,9 +2748,8 @@ msgid "Report abuse"
 msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Visi Pranešimai"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2941,18 +2892,18 @@ msgstr ""
 
 #: templates/web/base/admin/template_edit.html:1
 msgid "Response Template for %s"
-msgstr ""
+msgstr "%s Atsakymo Šablonas"
 
 #: templates/web/base/admin/templates_index.html:1
 msgid "Response Templates"
-msgstr ""
+msgstr "Atsakymo Šablonai"
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
 #: templates/web/zurich/admin/template_edit.html:1
 #: templates/web/zurich/admin/template_edit.html:4
 msgid "Response Templates for %s"
-msgstr ""
+msgstr "%s Atsakymo Šablonai"
 
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
@@ -3013,8 +2964,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3240,8 +3190,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3322,9 +3271,8 @@ msgid "Subscribe me to an email alert"
 msgstr ""
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "įveskite problemos detales"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
 msgid "Summarise your changes"
@@ -3333,8 +3281,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3364,13 +3311,13 @@ msgstr ""
 
 #: templates/web/zurich/admin/template_edit.html:7
 msgid "Template &laquo;%s&raquo;"
-msgstr ""
+msgstr "Šablonas &laquo;%s&raquo;"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:661
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:393
 #: templates/web/zurich/header.html:69
 msgid "Templates"
-msgstr ""
+msgstr "Šablonai"
 
 #: templates/web/base/admin/list_updates.html:12
 #: templates/web/base/admin/templates.html:11
@@ -3782,9 +3729,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Sukurta:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3811,9 +3757,8 @@ msgid "Unconfirmed"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Nauji pranešimai"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3949,8 +3894,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
@@ -4207,9 +4151,8 @@ msgstr ""
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Patvirtinti paskyrą"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4377,9 +4320,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(pasirinktinai)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4542,23 +4484,3 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
-
-#~ msgid "(public)"
-#~ msgstr "(viešas)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Visa jūsų suteikta informacija bus išsiųsta"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr ""
-#~ "Visa jūsų suteikta informacija bus išsiųsta į \n"
-#~ "<strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Nustatyti Pabaigos Tašką"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Apibūdinkite kas negerai, tikslią vietą ir kiek ilgai tai tęsiasi..."
-
-#~ msgid "One-line summary"
-#~ msgstr "Vieno eilutės santrauka"
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index e3e9dd41b..0789a37a5 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,16 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Chow Chee Leong <klrkdekira@gmail.com>, 2013
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Malay (http://www.transifex.com/mysociety/fixmystreet/language/ms/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -278,9 +277,8 @@ msgid "Add user"
 msgstr "Tambah pengguna"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Tambah kategori baru"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -324,15 +322,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Semua Laporan"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Semua laporan"
@@ -358,9 +354,8 @@ msgstr "Tanpa Nama:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Tambah pengguna"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -372,9 +367,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Adakan anda developer?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -409,9 +403,8 @@ msgid "Assign to subdivision:"
 msgstr "Ditugaskan kepada bahagian bawah:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Ditugaskan kepada %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -431,9 +424,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Tindak balas awam:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -454,9 +446,8 @@ msgid "Back"
 msgstr "Balik"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Semua laporan"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -500,14 +491,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategori"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategori:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -524,9 +513,8 @@ msgid "Category"
 msgstr "Kategori"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "seperti ‘%s’ atau ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -552,9 +540,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Melarang alamat emel"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -642,9 +629,8 @@ msgid "Closed by council"
 msgstr "Ditutup oleh majlis"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Semua laporan"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -775,14 +761,12 @@ msgid "Create category"
 msgstr "Kategori baru"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Laporan baru"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Tidak dilaporkan kepada majlis"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -850,9 +834,8 @@ msgid "Description"
 msgstr "Huraian"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Huraian"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -939,28 +922,24 @@ msgid "Edit body details"
 msgstr "Edit perincian badah"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Edit perincian badah"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Kategori baru"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Tapis senarai laporan"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Semua laporan"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1004,9 +983,8 @@ msgstr "Emel ditambahkan kepada senarai penyalahguna"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Alamat emel:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1111,9 +1089,8 @@ msgstr "Contoh:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Kategori baru"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1135,14 +1112,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Ditugaskan kepada badan luaran:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Nota dalaman"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1150,9 +1125,8 @@ msgid "Extra data:"
 msgstr "Data tambahan:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Data tambahan:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1194,9 +1168,8 @@ msgid "Fixed - User"
 msgstr "Diselesai - Pengguna"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Laporan baru"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1601,9 +1574,8 @@ msgid "Last&nbsp;update:"
 msgstr "Kemas kini terakhir:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Kemas kini terakhir:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1618,10 +1590,9 @@ msgid "Loading..."
 msgstr "Loading..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "RSS feed tempatan dan pemberitahuan emel"
@@ -1696,14 +1667,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Termasuk perincian peribadi pelapor"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Laporan baru"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1750,9 +1719,8 @@ msgid "Name: %s"
 msgstr "Nama: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Feed RSS untuk kemas kini bagi masalah ini"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1791,9 +1759,8 @@ msgid "New category contact added"
 msgstr "Kategori hubungan baru ditambahi"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Alamat emel:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1809,15 +1776,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Kata Laluan:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Laporan baru"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1878,9 +1843,8 @@ msgid "No"
 msgstr "Tidak"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "kawasan lain:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2065,9 +2029,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "API Open311 untuk pelayan FixMyStreet mySociety"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Spesifikasi Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2183,9 +2146,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2239,8 +2201,7 @@ msgid "Please choose a property type"
 msgstr "Sila pilihkan jenis bangunan"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2267,9 +2228,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Sila masukkan kata laluan"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2395,9 +2355,8 @@ msgid "Please note:"
 msgstr "Sila  nota:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Sila tuliskan kemas kini anda di sini"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2574,9 +2533,8 @@ msgid "Provide an update"
 msgstr "Sediakan kemas kini"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Sediakan kemas kini"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2593,9 +2551,8 @@ msgid "Public response:"
 msgstr "Tindak balas awam:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Tindak balas awam:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2697,9 +2654,8 @@ msgid "Recently reported problems"
 msgstr "Masalah yang dilaporkan baru-baru ini"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Dapatkan kemas kini"
+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."
@@ -2748,9 +2704,8 @@ msgid "Report abuse"
 msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Semua Laporan"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2965,8 +2920,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3012,9 +2966,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Tajuk:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3058,9 +3011,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Dipostkan oleh %s pada %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3194,8 +3146,7 @@ msgstr "Negeri:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3276,20 +3227,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Langgankan pemberitahuan emel"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Masukkan perincian masalah tersebut"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Hantar perubahan"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3576,15 +3524,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3739,9 +3685,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Diwujudkan:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3768,9 +3713,8 @@ msgid "Unconfirmed"
 msgstr "Belum dipastikan"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Laporan baru"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3879,9 +3823,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipaparkan kepada admin. Nota tidak akan dipapar secara awam dan tidak akan dihantar kepada badan."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3907,8 +3850,7 @@ msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Pengguna"
 
@@ -4168,9 +4110,8 @@ msgstr "Laporan Anda"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Mengesahkan Akaun"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4231,9 +4172,8 @@ msgstr "Laporan anda"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Laporan Anda"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4241,9 +4181,8 @@ msgstr "Kemas kini anda"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Emel Anda"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4340,9 +4279,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(tidak diwajibkan)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4483,24 +4421,3 @@ msgstr[0] "%d hari"
 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] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini."
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Semua maklumat yang disediakan anda akan dihantar kepada"
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Mengkonfigurasi Endpoint"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS atas Google Maps"
-
-#~ msgid "Survey"
-#~ msgstr "Kajian"
-
-#~ msgid "We never show your email"
-#~ msgstr "Kita tidak akan mempaprkan emel anda"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Pastikan anda menghantar lagi?"
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
index de415fe4e..a0d1d90a2 100644
--- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,21 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# bambi <thyunaung@yahoo.com>, 2014
-# berrycake4 <berrycake.net@gmail.com>, 2014
-# chitko <saintjohn769@gmail.com>, 2014
-# compunuts <compunuts@yahoo.com>, 2014
-# Pyae Sone <gipsyhnh@gmail.com>, 2014
-# soemoe.lwin.50 <htetaunglwin112@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Burmese (Myanmar) (http://www.transifex.com/mysociety/fixmystreet/language/my_MM/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n"
 "Language: my_MM\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -280,9 +274,8 @@ msgid "Add user"
 msgstr "အသံုးျပဳသူထည့္မည္"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -326,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "အစီရင္ခံစာအားလံုး"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "အစီရင္ခံစာအားလံုး"
@@ -360,9 +351,8 @@ msgstr "အမည္မသိ-"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "အသံုးျပဳသူထည့္မည္"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -374,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Developer လား"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -411,9 +400,8 @@ msgid "Assign to subdivision:"
 msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "%s သို႔ လြဲအပ္မည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -455,9 +443,8 @@ msgid "Back"
 msgstr "ေနာက္သို႔"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "အစီရင္ခံစာအားလံုး"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -501,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "အမ်ိဳးအစား"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "အမ်ိဳးအစား -"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -525,9 +510,8 @@ msgid "Category"
 msgstr "အမ်ိဳးအစား"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "ဥပမာ ‘%s’ သို႔မဟုတ္ ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -553,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -643,9 +626,8 @@ msgid "Closed by council"
 msgstr "ေကာင္စီမွပိတ္ထားသည္"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရန္"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -776,14 +758,12 @@ msgid "Create category"
 msgstr "အမ်ိဳးအစားဖန္တီးမည္"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီးမည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "ေကာင္စီသို႔အစီရင္မခံရေသး"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -851,9 +831,8 @@ msgid "Description"
 msgstr "ေဖာ္ျပခ်က္"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "ေဖာ္ျပခ်က္"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -940,28 +919,24 @@ msgid "Edit body details"
 msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "အမ်ိဳးအစားဖန္တီးမည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထုတ္မည္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "အစီရင္ခံစာအားလံုး"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1005,9 +980,8 @@ msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "အီးေမးလ္လိပ္စာ-"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1112,9 +1086,8 @@ msgstr "နမူနာမ်ား -"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "အမ်ိဳးအစားဖန္တီးမည္"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1136,14 +1109,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ -"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "အတြင္းမွတ္စု"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1151,9 +1122,8 @@ msgid "Extra data:"
 msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1195,9 +1165,8 @@ msgid "Fixed - User"
 msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "အစီရင္ခံစာအသစ္မ်ား"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1432,9 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "ျပႆနာ တစ္ခုကို ဤေနရာတြင္ တင္သြင္းပါက ျပႆနာ၏ အေသးစိတ္ အခ်က္အလက္ကို အမ်ားျပည္သူ ျမင္ေတြ႕ႏိုင္သည္။ သို႔ေသာ္ ျပႆနာကို ေကာင္စီထံ အစီရင္ခံမည္ မဟုတ္ပါ။"
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1603,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္း-"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1620,10 +1587,9 @@ msgid "Loading..."
 msgstr "ဖြင့္ေနသည္"
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား"
@@ -1698,14 +1664,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီးမည္"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1752,9 +1716,8 @@ msgid "Name: %s"
 msgstr "အမည္ - %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1793,9 +1756,8 @@ msgid "New category contact added"
 msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "အီးေမးလ္လိပ္စာ-"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1811,15 +1773,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "စကား၀ွက္-"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "အစီရင္ခံစာအသစ္မ်ား"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1880,9 +1840,8 @@ msgid "No"
 msgstr "မရွိပါ"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "အျခား ဧရိယာမ်ား"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2182,9 +2141,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "ဓာတ္ပံု"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2238,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr "ပစၥည္းအမ်ိဳးအစားတစ္ခုကိုေရြးပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2266,9 +2223,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2394,9 +2350,8 @@ msgid "Please note:"
 msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2573,9 +2528,8 @@ msgid "Provide an update"
 msgstr ""
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2592,9 +2546,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s တိုက္ရိုက္အသစ္ရယူျခင္:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2696,9 +2649,8 @@ msgid "Recently reported problems"
 msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
+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."
@@ -2747,9 +2699,8 @@ msgid "Report abuse"
 msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "အစီရင္ခံစာအားလံုး"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2964,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3011,9 +2961,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "စာကိုယ္တစ္ခုကို ေရြးပါ။"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3057,9 +3006,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "%s မွာ %s မွတင္ခဲ့သည္"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3193,8 +3141,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3275,20 +3222,17 @@ msgid "Subscribe me to an email alert"
 msgstr ""
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3575,15 +3519,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အညီ သင့္၏ တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အညီ သင့္၏ တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3738,9 +3680,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "ဖန္တီးခဲ့ခ်ိန္-"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3767,9 +3708,8 @@ msgid "Unconfirmed"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "အစီရင္ခံစာအသစ္မ်ား"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3878,9 +3818,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "စီမံသူတြင္သာ ေဖာ္ျပေပးသည့္ အေသးစိတ္ကို မွတ္တမ္းတင္ရန္ မွတ္စုကို အသုံးျပဳပါ။ မွတ္စုမ်ားကို လူအမ်ားမေတြ႔ျမင္ရ သလို အဖြဲ႔ထံသို႔လည္း မေပးပို႔ႏိုင္ပါ။"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3906,8 +3845,7 @@ msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တိ
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "အသံုးျပဳသူမ်ား"
 
@@ -4171,9 +4109,8 @@ msgstr "သင္၏ အစီရင္ခံစာမ်ား"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "အေကာင့္ကိုအတည္ျပဳမည္"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4234,9 +4171,8 @@ msgstr "သင္၏ အစီရင္ခံစာမ်ား"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "သင္၏ အစီရင္ခံစာမ်ား"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4244,9 +4180,8 @@ msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈ
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "သင္၏ အီးေမးလ္"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4343,9 +4278,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4486,24 +4420,3 @@ msgstr[0] "%d ရက္မ်ား"
 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] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေနရာႏွင့္ ပတ္သက္သည့္ အျခားေကာင္အတြက္ အေသးစိတ္မရွိေသးပါ။"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာ"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာမွာ <strong>%s</strong>သို႔ပို႔မည္"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "Google Maps ေပၚက GeoRSS"
-
-#~ msgid "Survey"
-#~ msgstr "စစ္တမ္း"
-
-#~ msgid "We never show your email"
-#~ msgstr "သင့္အီးေမးလိပ္စာကို ျပသ သြားမည္မဟုတ္ပါ။"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "မိမိတို႔သည္ သင့္ဖုန္းနံပါတ္ သို႔မဟုတ္ အီးေမးလိပ္စာကို ျပသသြားမည္ မဟုတ္ပါ"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "သင္ အမွန္တကယ္ ျပန္လည္ ေပးပို႔ခ်င္ပါသလား?"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 686be1360..cf141fa83 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -329,8 +329,7 @@ msgstr "Alle kategorier"
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alle rapporter"
@@ -1137,7 +1136,7 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
 msgid "External team"
-msgstr ""
+msgstr "Eksternt lag"
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1522,7 +1521,7 @@ msgstr "Trenger inspeksjon"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
-msgstr ""
+msgstr "Instruer underleverandør til å fikse problemer"
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
@@ -1547,7 +1546,7 @@ msgstr "Ugyldig format %s oppgitt."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:361
 msgid "Invalid location. New location must be covered by the same council."
-msgstr ""
+msgstr "Ugyldig plassering.  Ny plassering må være dekket av den samme administrasjonen."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1479
 msgid "Invalid start date"
@@ -1601,9 +1600,8 @@ msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Siste oppdatering:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1618,10 +1616,9 @@ msgid "Loading..."
 msgstr "Laster..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokal RSS-strøm og e-postvarsel"
@@ -1713,7 +1710,7 @@ msgstr "Måned"
 
 #: templates/web/base/reports/_list-filters.html:39
 msgid "Most commented"
-msgstr ""
+msgstr "Mest kommentert"
 
 #: templates/web/base/admin/bodies.html:25
 #: templates/web/base/admin/body-form.html:24
@@ -1851,7 +1848,7 @@ msgstr "Ny mal"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
-msgstr ""
+msgstr "Nyeste"
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
@@ -2032,7 +2029,7 @@ msgstr "Eldre <br>problemer"
 
 #: templates/web/base/reports/_list-filters.html:36
 msgid "Oldest"
-msgstr ""
+msgstr "Eldste"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
@@ -2133,7 +2130,7 @@ msgstr "Permalink"
 
 #: templates/web/base/admin/user-form.html:152
 msgid "Permissions:"
-msgstr ""
+msgstr "Rettigheter:"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
@@ -2237,8 +2234,7 @@ msgid "Please choose a property type"
 msgstr "Velg en type egenskap"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Husk å rette opp feilene nedenfor."
 
@@ -2696,9 +2692,8 @@ msgid "Recently reported problems"
 msgstr "Nylig meldte problemer"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Få oppdateringer"
+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."
@@ -2963,8 +2958,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Søk i rapporter"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søk i brukere"
 
@@ -3193,8 +3187,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3285,8 +3278,7 @@ msgstr "Oppsummer dine endringer"
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3924,8 +3916,7 @@ msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. "
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brukere"
 
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index 481d2de16..800b9e58d 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Edwin Bosveld <edwin@inwy.nl>, 2012
-# Milo van der Linden <milo@dogodigi.net>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/mysociety/fixmystreet/language/nl_NL/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Jos Helmich <jos@valaquanta.fi>, 2016\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +52,7 @@ msgstr "%s beheerder:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
-msgstr ""
+msgstr "%s openbare lichamen"
 
 #: templates/web/base/status/stats.html:24
 msgid "%s confirmed alerts, %s unconfirmed"
@@ -114,7 +112,7 @@ msgstr "%s, in %s district"
 
 #: perllib/FixMyStreet/Map/OSM.pm:42
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
-msgstr ""
+msgstr "&Rechten; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> bijdragende partijen"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:21
 msgid "(Defect &amp; location of defect)"
@@ -182,11 +180,11 @@ msgstr "-- Kies een woning type --"
 
 #: templates/web/base/admin/response_templates_select.html:4
 msgid "--Choose a template--"
-msgstr ""
+msgstr "--Kies een website indeling--"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
-msgstr ""
+msgstr "Een 25 cm diep gat op voorbeeldstraat bij de brievenbus"
 
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
@@ -195,6 +193,9 @@ msgid ""
 "              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> is op  (<code>%s</code>) gezet, maar er zijn geen <code>MAPIT_TYPES</code>.<br>\n"
+"Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).<br>\n"
+"Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?"
 
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
@@ -222,11 +223,11 @@ msgstr "<strong>Nee</strong> Laat me inloggen per e-mail"
 
 #: templates/web/base/report/_inspect.html:133
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
-msgstr ""
+msgstr "<strong>N.B:</strong> Deze rapportage is verzonden opdat actie wordt ondernomen. Veranderingen worden daarom niet meer meegenomen."
 
 #: templates/web/base/report/_inspect.html:135
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
-msgstr ""
+msgstr "<strong>N.B:</strong>Deze rapportage is nog niet verzonden om actie te ondernemen. Veranderingen worden mogelijk niet doorgegeven."
 
 #: templates/web/base/auth/general.html:80
 #: templates/web/base/report/new/form_user_loggedout_password.html:3
@@ -248,6 +249,8 @@ msgid ""
 "          to which problem reports can be sent. You can add one or more contacts (for different\n"
 "          categories of problem) to each body."
 msgstr ""
+"Voeg een  <strong>Openbaar lichaam (organisatie)</strong> toe voor elk bestuursorgaan zoals een gemeenteraad of een gemeentelijke afdeling waaraan de rapporten verzonden kunnen worden.\n"
+"Je kunt een of meer aanspreekpunten toevoegen (voor verschillende probleemcategoriën) voor elk openbaar lichaam."
 
 #: templates/web/base/admin/body.html:60
 msgid "Add a contact using the form below."
@@ -257,7 +260,7 @@ msgstr "Voeg een contactpersoon toe"
 #: templates/web/base/admin/body-form.html:138
 #: templates/web/zurich/admin/body-form.html:52
 msgid "Add body"
-msgstr ""
+msgstr "Voeg openbaar lichaam toe"
 
 #: templates/web/base/admin/body.html:126
 #: templates/web/zurich/admin/body.html:31
@@ -268,7 +271,7 @@ msgstr "Voeg een nieuwe categorie toe"
 #: templates/web/base/report/_main.html:19
 #: templates/web/base/report/_main.html:27
 msgid "Add to shortlist"
-msgstr ""
+msgstr "Voeg aan favorieten toe"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
@@ -276,17 +279,16 @@ msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Voeg een nieuwe categorie toe"
+msgstr "Voeg toe/wijzig categoriën"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
-msgstr ""
+msgstr "Voeg toe/wijzig beantwoordingsprioriteiten"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
-msgstr ""
+msgstr "Voeg toe/wijzig antwoordstramien"
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -294,7 +296,7 @@ msgstr "%s toegevoegd"
 
 #: templates/web/base/report/_main.html:141
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
-msgstr ""
+msgstr "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s zijn favorieten."
 
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
@@ -322,15 +324,13 @@ msgid "All Reports as CSV"
 msgstr "Alle rapporten als CSV"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Alle meldingen"
+msgstr "Alle categoriën"
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alle meldingen"
@@ -356,9 +356,8 @@ msgstr "Anoniem:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Gebruiker toevoegen"
+msgstr "Andere gebruiker"
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -366,28 +365,27 @@ msgstr "Ben je een ontwikkelaar?"
 
 #: templates/web/base/js/translation_strings.html:53
 msgid "Are you sure you want to cancel this upload?"
-msgstr ""
+msgstr "Weet je zeker dat je de bestandsoverdracht wil afbreken?"
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Ben je een ontwikkelaar?"
+msgstr "Weet je het zeker?"
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
 #: templates/web/zurich/admin/body-form.html:24
 msgid "Area covered"
-msgstr ""
+msgstr "Bestreken gebied"
 
 #: templates/web/base/admin/user-form.html:64
 msgid "Area:"
-msgstr ""
+msgstr "Gebied:"
 
 #: templates/web/base/admin/bodies.html:19
 #: templates/web/base/admin/body.html:64
 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 ""
+msgstr "Dit is een website in opbouw! %s is false. Rapportages op deze site worden doorgegeven aan de rapporteur, niet aan het opgegeven aanspreekpunt."
 
 #: templates/web/zurich/admin/report_edit.html:209
 msgid "Assign to competent body:"
@@ -407,9 +405,8 @@ msgid "Assign to subdivision:"
 msgstr "Toegewezen aan afdeling:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Toegewezen aan %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -430,16 +427,16 @@ msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
 msgid "Auto-response:"
-msgstr ""
+msgstr "Automatisch antwoord:"
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
 msgid "Available categories"
-msgstr ""
+msgstr "Beschikbare categoriën"
 
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
-msgstr ""
+msgstr "Zet hier geen persoonlijke informatie of nummerborden van autos neer"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:401
 #: templates/web/zurich/report/_item.html:9
@@ -451,9 +448,8 @@ msgid "Back"
 msgstr "Vorige"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Alle meldingen"
+msgstr "Terug naar alle rapportages"
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -466,18 +462,18 @@ msgstr "Verban e-mailadres"
 #: templates/web/base/admin/report_edit.html:55
 #: templates/web/zurich/header.html:56
 msgid "Bodies"
-msgstr ""
+msgstr "Openbare lichamen"
 
 #: templates/web/base/admin/flagged.html:17
 #: templates/web/base/admin/index.html:57
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
-msgstr ""
+msgstr "Openbaar lichaam"
 
 #: templates/web/base/admin/user-form.html:36
 msgid "Body:"
-msgstr ""
+msgstr "Openbaar lichaam:"
 
 #: templates/web/base/admin/stats.html:87
 msgid "By Date"
@@ -485,7 +481,7 @@ msgstr "Op datum"
 
 #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr ""
+msgstr "Kun je onze email niet vinden? Check je spamfolder. Dat is oplossing in 99% van de gevallen."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
@@ -493,18 +489,16 @@ msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>"
 
 #: templates/web/base/report/_inspect.html:141
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Categorie"
+msgstr "Categoriën"
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Categorie:"
+msgstr "Categoriën:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -521,9 +515,8 @@ msgid "Category"
 msgstr "Categorie"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "bv. '%s' of '%s'"
+msgstr "Categorie veranderd van '%s' in '%s'"
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -544,14 +537,13 @@ msgstr "Categorie: %s"
 
 #: templates/web/base/my/my.html:24
 msgid "Change email"
-msgstr ""
+msgstr "Verander email"
 
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Verban e-mailadres"
+msgstr "Verander emailadres"
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -566,12 +558,16 @@ msgid ""
 "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
 "                If you are not sure of the origin or validity of the contact, leave this unchecked."
 msgstr ""
+"Vink <strong>Bevestigd</strong> aan om aan te geven dat dit aanspreekpunt klopt\n"
+"Als je geen absolute zekerheid hebt over de bron of de deugdelijkheid van dit aanspreekpunt laat het vinkje weg."
 
 #: templates/web/base/admin/contact-form.html:52
 msgid ""
 "Check <strong>deleted</strong> to remove the category from use. \n"
 "        It will not appear as an available category in the drop-down menu on the report-a-problem page."
 msgstr ""
+"Vink <strong>verwijderen</strong> aan om een categorie buiten gebruik te stellen.\n"
+"Deze categorie zal niet meer als beschikbaar categorie worden weergeven bij het selectie-menu van de rapporteer pagina."
 
 #: templates/web/base/admin/contact-form.html:79
 msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
@@ -597,7 +593,7 @@ msgstr ""
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
-msgstr ""
+msgstr "Klik hier of geef de datum in dd/mm/yyyy formaat"
 
 #: templates/web/base/around/_report_banner.html:2
 msgid "Click map to report a problem"
@@ -613,11 +609,11 @@ msgstr ""
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr ""
+msgstr "Klik op de link in onze bevestigingsemail om je wijzigingen te publiceren."
 
 #: templates/web/base/auth/token.html:18
 msgid "Click the link in our confirmation email to sign in."
-msgstr ""
+msgstr "Klik op de link in onze bevestigingsemail om in te loggen."
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
@@ -667,7 +663,7 @@ msgstr "Cobrand:"
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
-msgstr ""
+msgstr "Configuratie"
 
 #: templates/web/base/admin/body.html:77
 msgid "Confirm"
@@ -771,14 +767,12 @@ msgid "Create category"
 msgstr "Maak een categorie"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Maak een melding"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Niet gemeld bij de gemeente"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -787,7 +781,7 @@ msgstr ""
 #: templates/web/base/admin/template_edit.html:36
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
-msgstr ""
+msgstr "Maak een sjabloon"
 
 #: templates/web/base/admin/problem_row.html:34
 #: templates/web/base/admin/templates.html:12
@@ -813,7 +807,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:825
 #: templates/web/zurich/admin/report_edit-sdm.html:105
 msgid "Customer not contactable"
-msgstr ""
+msgstr "Klant kan niet bereikt worden"
 
 #: templates/web/base/dashboard/index.html:5
 #: templates/web/base/dashboard/index.html:7
@@ -822,13 +816,13 @@ msgstr "Dashboard"
 
 #: templates/web/zurich/admin/stats.html:35
 msgid "Dealt with by subdivision within 5 working days"
-msgstr ""
+msgstr "Door een afdeling behandeld binnen 5 werkdagen"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
 #: templates/web/base/admin/template_edit.html:40
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
-msgstr ""
+msgstr "Verwijder sjabloon"
 
 #: templates/web/base/admin/bodies.html:31
 #: templates/web/base/admin/body.html:87
@@ -843,11 +837,11 @@ msgstr "Verwijderd"
 #: templates/web/zurich/admin/index-sdm.html:20
 #: templates/web/zurich/admin/reports.html:12
 msgid "Description"
-msgstr ""
+msgstr "Beschrijving"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
 msgid "Description:"
-msgstr ""
+msgstr "Beschrijving:"
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -868,7 +862,7 @@ msgstr "Overgedragen"
 #: templates/web/zurich/admin/report_edit-sdm.html:52
 #: templates/web/zurich/admin/report_edit.html:71
 msgid "Didn't use map"
-msgstr ""
+msgstr "Kaart niet gebruikt"
 
 #: templates/web/base/admin/edit-league.html:8
 msgid "Diligency prize league table"
@@ -876,7 +870,7 @@ msgstr "Toewijdingsranglijst"
 
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
-msgstr ""
+msgstr "Zend bij eventueel commentaar geen email waarschuwingen naar degene die probleem aanmaakte"
 
 #. ("%s is the site name")
 #: templates/web/base/auth/general.html:58
@@ -885,7 +879,7 @@ msgstr ""
 #: templates/web/base/report/update-form.html:30
 #: templates/web/base/report/update/form_user_loggedout.html:27
 msgid "Do you have a %s password?"
-msgstr ""
+msgstr "Heb je een %s wachtwoord?"
 
 #: templates/web/base/questionnaire/index.html:57
 msgid "Don&rsquo;t know"
@@ -893,18 +887,18 @@ msgstr "Geen idee"
 
 #: templates/web/base/contact/index.html:110
 msgid "Don't like forms?"
-msgstr ""
+msgstr "Hou je niet van formulieren?"
 
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
-msgstr ""
+msgstr "Plaats de fotos hier om ze te <u>verzenden</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
-msgstr ""
+msgstr "Dubbeling"
 
 #: templates/web/base/admin/body.html:116
 msgid ""
@@ -916,7 +910,7 @@ msgstr ""
 
 #: templates/web/base/report/_inspect.html:16
 msgid "Easting/Northing:"
-msgstr ""
+msgstr "Oostwaarde/Noordwaarde"
 
 #: templates/web/base/admin/list_updates.html:42
 #: templates/web/base/admin/problem_row.html:41
@@ -931,30 +925,27 @@ msgstr "Bewerk"
 #: templates/web/base/admin/index.html:35
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
-msgstr ""
+msgstr "Wijzig openbaar lichaam details"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Geef details"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Maak een categorie"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Alle meldingen"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -998,9 +989,8 @@ msgstr "Email toegevoegd aan zwarte lijst"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Verban e-mailadres"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1105,9 +1095,8 @@ msgstr "Voorbeelden:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Maak een categorie"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1129,14 +1118,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Toegewezen aan:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Interne notities"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1144,9 +1131,8 @@ msgid "Extra data:"
 msgstr "Extra info:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Extra info:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1188,9 +1174,8 @@ msgid "Fixed - User"
 msgstr "Opgelost - Gebruiker"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Onopgeloste meldingen"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1425,9 +1410,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Het onderwerp en details van het probleem worden publiek zichtbaar als je deze instuurt, maar het probleem zal <strong>niet</strong> worden verzonden aan de gemeente."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1596,9 +1580,8 @@ msgid "Last&nbsp;update:"
 msgstr "Laatste update:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Laatste update:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1613,10 +1596,9 @@ msgid "Loading..."
 msgstr "Laden..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokale RSS feeds en e-mail meldingen"
@@ -1695,9 +1677,8 @@ msgid "Moderate report details"
 msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Maak een melding"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1744,9 +1725,8 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS feed van updates voor dit probleem"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1787,9 +1767,8 @@ msgid "New category contact added"
 msgstr "Nieuw contactpersonen voor categorie toegevoegd"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Verban e-mailadres"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1805,9 +1784,8 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Wachtwoord:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
@@ -2057,9 +2035,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API voor de mySociety FixMyStreet server"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311 specificatie"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2175,9 +2152,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2231,8 +2207,7 @@ msgid "Please choose a property type"
 msgstr "Kies een pand type"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2259,9 +2234,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Geef wachtwoord"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2387,9 +2361,8 @@ msgid "Please note:"
 msgstr "Let op:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Geef een reden op waarom je deze melding heropent"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2566,9 +2539,8 @@ msgid "Provide an update"
 msgstr "Geef een update"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Geef een update"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2585,9 +2557,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s live updates"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2689,9 +2660,8 @@ msgid "Recently reported problems"
 msgstr "Recent gemelde problemen"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Updates ontvangen"
+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."
@@ -2726,9 +2696,8 @@ msgid "Report"
 msgstr "Melding"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Melding"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2741,9 +2710,8 @@ msgid "Report abuse"
 msgstr "Meld misbruik"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Meldingen"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2958,8 +2926,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Zoek Meldingen"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Zoek Gebruikers"
 
@@ -3005,9 +2972,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Onderwerp:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3051,9 +3017,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Geplaatst door %s bij %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3187,8 +3152,7 @@ msgstr "Staat:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3269,20 +3233,17 @@ msgid "Subscribe me to an email alert"
 msgstr ""
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Geef details van het probleem"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Wijzigingen opslaan"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3569,15 +3530,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3732,9 +3691,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Aangemaakt:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3898,8 +3856,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Gebruikers"
 
@@ -4156,9 +4113,8 @@ msgstr "Jouw meldingen"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Bevestig account"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4219,9 +4175,8 @@ msgstr "Jouw meldingen"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Jouw meldingen"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4229,9 +4184,8 @@ msgstr "Jouw updates"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Jouw e-mail"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4328,9 +4282,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(optioneel)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4482,24 +4435,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] ""
 msgstr[1] ""
-
-#~ msgid "(public)"
-#~ msgstr "(publiek)"
-
-#~ msgid "Additional Information"
-#~ msgstr "Aanvullende informatie"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Alle informatie die je ingevuld hebt zal worden verstuurd naar"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar  <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Configureer eindpunt"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS op Google Maps"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Weet je zeker dat je dit opnieuw wilt versturen?"
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index ed46e6465..e83fdd3fa 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Anders Einar Hilden <hildenae@gmail.com>, 2011
-# Guttorm Flatabø <post@guttormflatabo.com>, 2013
-# Petter Reinholdtsen <pere@hungry.com>, 2011
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nn_NO/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n"
 "Language: nn_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -277,9 +274,8 @@ msgid "Add user"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Legg til ny kategori"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -323,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Alle rapportar"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alle rapportar"
@@ -449,9 +443,8 @@ msgid "Back"
 msgstr ""
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Alle rapportar"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -495,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategori"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategori:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -519,9 +510,8 @@ msgid "Category"
 msgstr "Kategori"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "Ei oppdatering endra problemstatusen til %s"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -547,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Bannlys e-postadresse"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -637,9 +626,8 @@ msgid "Closed by council"
 msgstr "(ikkje rapportert til administrasjonen)"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Send rapport på nytt"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -770,14 +758,12 @@ msgid "Create category"
 msgstr "Lag kategori"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Lag ein rapport"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Ikkje rapportert til administrasjonen"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -933,28 +919,24 @@ msgid "Edit body details"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Ver venleg og legg inn opplysningar om problemet"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Lag kategori"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Sjå rapport på nettstaden"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Alle rapportar"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -998,9 +980,8 @@ msgstr "E-post lagd til misbrukliste"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Bannlys e-postadresse"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1105,9 +1086,8 @@ msgstr "Døme:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Lag kategori"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1185,9 +1165,8 @@ msgid "Fixed - User"
 msgstr "Løyst – Brukar"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Send rapport på nytt"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1422,9 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Viss du sender inn eit problem hit, så vil emnet og detaljar for problemet vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til administrasjonen."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1593,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Siste oppdatering:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1610,10 +1587,9 @@ msgid "Loading..."
 msgstr "Lastar …"
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokal RSS-straum og e-postvarsel"
@@ -1692,9 +1668,8 @@ msgid "Moderate report details"
 msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Lag ein rapport"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1741,9 +1716,8 @@ msgid "Name: %s"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS-straum med oppdateringar for dette problemet"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1782,9 +1756,8 @@ msgid "New category contact added"
 msgstr "Ny kategorikontakt lagt til"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Bannlys e-postadresse"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1800,9 +1773,8 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Passord:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
@@ -1868,9 +1840,8 @@ msgid "No"
 msgstr "Nei"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "andre område:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2053,9 +2024,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311-API for mySocietys FiksGataMi-tenar"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311-spesifikasjon"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2226,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr "Vel ein type eigenskap"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2254,9 +2223,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Skriv inn eit passord"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2384,9 +2352,8 @@ msgid "Please note:"
 msgstr "Merk:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2563,9 +2530,8 @@ msgid "Provide an update"
 msgstr "Bidra med ei oppdatering"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Bidra med ei oppdatering"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2582,9 +2548,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s aktive oppdateringar"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2686,9 +2651,8 @@ msgid "Recently reported problems"
 msgstr "Nyleg melde problem"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Nyleg melde problem"
+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."
@@ -2723,9 +2687,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Rapport på %s"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2738,9 +2701,8 @@ msgid "Report abuse"
 msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Rapport på %s"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2955,8 +2917,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Søk i rapportar"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søk i brukarar"
 
@@ -3002,9 +2963,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Emne:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3048,9 +3008,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Sendt inn av %s %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3184,8 +3143,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3266,20 +3224,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Eg ynskjer å abonnera på e-postvarsel"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Legg inn detaljar om problemet"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Send inn endringar"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3730,9 +3685,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Oppretta:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3759,9 +3713,8 @@ msgid "Unconfirmed"
 msgstr "Ikkje stadfesta"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Send rapport på nytt"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3897,8 +3850,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brukarar"
 
@@ -4155,9 +4107,8 @@ msgstr "Rapportane dine"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Stadfest konto"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4218,9 +4169,8 @@ msgstr "Oppdateringane dine"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Rapportane dine"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4326,9 +4276,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(valfritt)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4480,15 +4429,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden."
 msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden."
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "All informasjonen du har lagt inn her vil sendast til"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS på Google Maps"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Ynskjer du verkeleg å senda på nytt?"
diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1da3fac59..0ed42fa6c 100644
--- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,20 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# daey <netrapida@live.com.pt>, 2016
-# francisco oliveira martins <francisco.martins@recortes.cv>, 2013
-# mySociety <transifex@mysociety.org>, 2013
-# daey <netrapida@live.com.pt>, 2016
-# simaor <simaor@hotmail.com>, 2016
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-08-11 13:58+0000\n"
-"Last-Translator: daey <netrapida@live.com.pt>\n"
-"Language-Team: Portuguese (http://www.transifex.com/mysociety/fixmystreet/language/pt/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,9 +274,8 @@ msgid "Add user"
 msgstr "Adicionar user"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Adicionar nova categoria"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -325,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Todos os Relatórios"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Todos os relatórios"
@@ -359,9 +351,8 @@ msgstr "Anonimo:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Adicionar user"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -373,9 +364,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Você é um desenvolvedor?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -410,9 +400,8 @@ msgid "Assign to subdivision:"
 msgstr "Atribuir a subdivisão:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Designado para %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -432,9 +421,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Resposta do público:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -455,9 +443,8 @@ msgid "Back"
 msgstr "Voltar"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "todos os relatórios"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -501,14 +488,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Categoria"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Categoria:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -525,9 +510,8 @@ msgid "Category"
 msgstr "Categoria"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "por exemplo '%s' ou '%s'"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -553,9 +537,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Ban endereço de e-mail"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -775,14 +758,12 @@ msgid "Create category"
 msgstr "Criar uma categoria"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Criar um report"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Nao reportado ao município"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -850,9 +831,8 @@ msgid "Description"
 msgstr "Descrição detalhada do problema"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Descrição detalhada do problema"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -939,28 +919,24 @@ msgid "Edit body details"
 msgstr "Editar os detalhes do corpo"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Editar os detalhes do corpo"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Criar uma categoria"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtrar relatorio"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "relatórios corrigidos"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1004,9 +980,8 @@ msgstr "Email adicionado a lista de abusos"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Ban endereço de e-mail"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1111,9 +1086,8 @@ msgstr "Exemplos:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Criar uma categoria"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1135,9 +1109,8 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Atribuir ao órgão externo:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
 msgid "External team"
@@ -1149,9 +1122,8 @@ msgid "Extra data:"
 msgstr "Dados adicionais:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Dados adicionais:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1429,12 +1401,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
-"Se você enviar um problema sobre qualquer assunto e detalhes,  será\"\n"
-"\"Público, mas o problema nao <strong> vai </strong> ser comunicados ao\"\n"
-"\"município\"."
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1603,9 +1571,8 @@ msgid "Last&nbsp;update:"
 msgstr "Última atualização:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Última atualização:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1620,10 +1587,9 @@ msgid "Loading..."
 msgstr "Carregando ..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "RSS feeds e alertas de e-mail locais"
@@ -1698,14 +1664,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Incluir reports detalhes perssoais"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Criar um report"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1752,9 +1716,8 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS feed de atualizações para este problema"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1796,9 +1759,8 @@ msgid "New category contact added"
 msgstr "Novo contato de categoria adicionado"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Ban endereço de e-mail"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1814,15 +1776,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Password:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Novos reports"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1883,9 +1843,8 @@ msgid "No"
 msgstr "Nao"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "outras áreas:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2068,9 +2027,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API para o servidor FixMyStreet mySociety"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Especificação Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2186,9 +2144,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Foto"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2242,8 +2199,7 @@ msgid "Please choose a property type"
 msgstr "Por favor, escolha um tipo de imóvel"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2273,9 +2229,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Por favor insira uma password"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2401,9 +2356,8 @@ msgid "Please note:"
 msgstr "Favor notar:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2580,9 +2534,8 @@ msgid "Provide an update"
 msgstr "Fornecer uma atualização"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Fornecer uma atualização"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2599,9 +2552,8 @@ msgid "Public response:"
 msgstr "Resposta do público:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Resposta do público:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2703,9 +2655,8 @@ msgid "Recently reported problems"
 msgstr "Problemas recentemente reportados"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Atualizações"
+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."
@@ -2740,9 +2691,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Relatórios"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2755,9 +2705,8 @@ msgid "Report abuse"
 msgstr "Abusivo"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Relatórios"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2867,9 +2816,8 @@ msgid "Reports published"
 msgstr "Os relatórios publicados"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Relatórios aguardando aprovação"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2973,8 +2921,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Busca Reports"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Procurar Usuários"
 
@@ -3020,9 +2967,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Assunto:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3066,9 +3012,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Postado por %s aem %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3202,8 +3147,7 @@ msgstr "Estado"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3284,20 +3228,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Subcrever um alerta de e-mail"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Submeter alteraçoes"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3584,15 +3525,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/privacy\"> política de privacidade.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/privacy\"> política de privacidade.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3747,9 +3686,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Criado:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3913,8 +3851,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Usuários"
 
@@ -4171,9 +4108,8 @@ msgstr "Os meus relatórios"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Confirmar conta"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4234,9 +4170,8 @@ msgstr "Os meus relatórios"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Os meus relatórios"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4244,9 +4179,8 @@ msgstr "Suas atualizações"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "O seu e-mail"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4343,9 +4277,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(opcional)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4497,30 +4430,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local."
 msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local."
-
-#~ msgid "(public)"
-#~ msgstr "(público)"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Todas as informações que fornecer aqui serão enviados para "
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong>"
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Configurar Endpoint"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS no Google Maps"
-
-#~ msgid "Survey"
-#~ msgstr "Teste"
-
-#~ msgid "We never show your email"
-#~ msgstr "Nós nunca divulgaremos o seu e-mail"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Você realmente deseja reenviar o email?"
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 22576f220..81ce09a26 100644
--- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,20 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# daniel andriev <andriev_daniel@yahoo.com>, 2015
-# fldrog <florin.botis@gmail.com>, 2014
-# raduplamadeala <radu@plamadeala.eu>, 2015
-# Radu <radu.bilei@gmail.com>, 2014
-# test test <nistorbog@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/mysociety/fixmystreet/language/ro_RO/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n"
 "Language: ro_RO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,9 +274,8 @@ msgid "Add user"
 msgstr "Adaugă utilizator"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Adaugă o categorie nouă"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -325,15 +319,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Adaugă o categorie nouă"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr ""
@@ -359,9 +351,8 @@ msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Adaugă utilizator"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -635,9 +626,8 @@ msgid "Closed by council"
 msgstr ""
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Rapoartele dvs."
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -937,9 +927,8 @@ msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Adaugă o categorie nouă"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Edit report priority"
@@ -1097,9 +1086,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Adaugă o categorie nouă"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1599,10 +1587,9 @@ msgid "Loading..."
 msgstr ""
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 ""
@@ -2209,8 +2196,7 @@ msgid "Please choose a property type"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2542,9 +2528,8 @@ msgid "Provide an update"
 msgstr ""
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "%s actualizări"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2561,9 +2546,8 @@ msgid "Public response:"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "%s actualizări"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2715,9 +2699,8 @@ msgid "Report abuse"
 msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Rapoartele dvs."
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2932,8 +2915,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3159,8 +3141,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3251,8 +3232,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3865,8 +3845,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
@@ -4185,9 +4164,8 @@ msgstr ""
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Rapoartele dvs."
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4293,9 +4271,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(opțional)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4458,9 +4435,3 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
-
-#~ msgid "(public)"
-#~ msgstr "(public)"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Chiar doriţi să retrimiteţi?"
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
index c50777f09..beca79978 100644
--- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Bakai <naubktl@gmail.com>, 2015
-# RU C2 <e2f54y54hgf@outlook.com>, 2015
-# Илья Владимирович Кучаев <kuchaev.iv@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Russian (http://www.transifex.com/mysociety/fixmystreet/language/ru/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -194,9 +191,8 @@ msgid "-- Pick a property type --"
 msgstr "-- Выберите тип имущества --"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "Выберите шаблон"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -296,18 +292,16 @@ msgid "Add user"
 msgstr "Добавить пользователя"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Добавить категорию"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
-#, fuzzy
 msgid "Add/edit response templates"
-msgstr "Шаблоны ответов для: %s"
+msgstr ""
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -343,15 +337,13 @@ msgid "All Reports as CSV"
 msgstr "Все обращения в виде CSV-файлов"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Все Отчеты"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Все отчеты"
@@ -377,9 +369,8 @@ msgstr "Анонимно:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Добавить пользователя"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -391,9 +382,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Вы разработчик?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -428,9 +418,8 @@ msgid "Assign to subdivision:"
 msgstr "Направить в подразделение:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Направлено сюда: %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -450,9 +439,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Публичный ответ:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -473,9 +461,8 @@ msgid "Back"
 msgstr "Назад"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "все обращения"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -519,14 +506,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Категория"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Категория:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -543,9 +528,8 @@ msgid "Category"
 msgstr "Категория"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "напр.: ‘%s’ или ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -571,9 +555,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Добавить адрес эл. почты в черный список"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -806,14 +789,12 @@ msgid "Create category"
 msgstr "Создать категорию"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Создать обращение"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Первое обращение в органы самоуправления"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -881,9 +862,8 @@ msgid "Description"
 msgstr "Описание"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Описание"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -974,28 +954,24 @@ msgid "Edit body details"
 msgstr "Редактировать информацию об учреждении"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Редактировать информацию об учреждении"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Создать категорию"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Сортировать список обращений"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "решенные проблемы"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1039,9 +1015,8 @@ msgstr "Адрес эл. почты добавлен в черный списо
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Адрес эл. почты:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1153,9 +1128,8 @@ msgstr "Примеры:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Создать категорию"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1169,23 +1143,20 @@ msgid "Extern"
 msgstr "Внешн."
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "Внешний URL"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "Внешний URL"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Внешний URL"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Внешний URL"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1193,9 +1164,8 @@ msgid "Extra data:"
 msgstr "Дополнительная информация:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Дополнительная информация:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1477,9 +1447,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Если вы сообщите о проблеме сюда, то тема вашего обращения, а также информация в нем будут находиться в общем доступе. Однако о проблеме <strong>не будет</strong> проинформирован орган самоуправления."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1574,9 +1543,8 @@ msgid "Incorrect has_photo value \"%s\""
 msgstr "Нверно задано значение has_photo \"%s\""
 
 #: templates/web/base/admin/contact-form.html:84
-#, fuzzy
 msgid "Inspection required"
-msgstr "Необходимо добавить фото"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
@@ -1659,9 +1627,8 @@ msgid "Last&nbsp;update:"
 msgstr "Последнее&nbsp;обновление:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Последнее обновление:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1676,10 +1643,9 @@ msgid "Loading..."
 msgstr "Загрузка..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Местные RSS-фиды и уведомления по эл. почте"
@@ -1754,14 +1720,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Включить персональные данные заявителя"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Создать обращение"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1808,9 +1772,8 @@ msgid "Name: %s"
 msgstr "Имя: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Новые данные для проблемы: %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1851,9 +1814,8 @@ msgid "New category contact added"
 msgstr "Добавлен новый контакт в категории"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Адрес эл. почты:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1869,15 +1831,13 @@ msgid "New note to DM:"
 msgstr "Новая заметка для DM:"
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Пароль:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Новые обращения"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1938,9 +1898,8 @@ msgid "No"
 msgstr "Нет"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "другие области"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1997,15 +1956,10 @@ msgstr "Нет"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"Обычные (публичные) пользователи не должны быть связаны с <strong>учреждением</strong>.<br>\n"
-"                Пользователи, являющиеся авторизованными сотрудниками, могут быть связаны с учреждением, которое они представляют.<br>\n"
-"                В зависимости от должности, сотрудники могут иметь доступ к панели управления (там содержится краткая информация\n"
-"                о действиях их учреждения), а также возможность скрывать обращения или устанавливать специфические статусы обращений."
 
 #: templates/web/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2134,9 +2088,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API для сервера mySociety FixMyStreet"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Спецификация Open311"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2252,9 +2205,8 @@ msgstr "Необходимо добавить фото"
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Фото"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2308,8 +2260,7 @@ msgid "Please choose a property type"
 msgstr "Выберите тип имущества"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Исправьте ошибки ниже"
 
@@ -2339,9 +2290,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Введите пароль"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2467,9 +2417,8 @@ msgid "Please note:"
 msgstr "Внимание:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Поясните, почему вы решили заново отправить это обращение"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2646,9 +2595,8 @@ msgid "Provide an update"
 msgstr "Предоставить новые данные"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Предоставить новые данные"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2665,9 +2613,8 @@ msgid "Public response:"
 msgstr "Публичный ответ:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Публичный ответ:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2769,9 +2716,8 @@ msgid "Recently reported problems"
 msgstr "Недавние обращения о проблемах"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Получать обновления"
+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."
@@ -2806,9 +2752,8 @@ msgid "Report"
 msgstr "Сообщить"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Сообщить"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2821,9 +2766,8 @@ msgid "Report abuse"
 msgstr "Сообщить об оскорбительном поведении"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Обращения"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2933,9 +2877,8 @@ msgid "Reports published"
 msgstr "Опубликованные обращения"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Обращения, ожидающие проверки"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2958,24 +2901,20 @@ msgid "Response Priorities"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:1
-#, fuzzy
 msgid "Response Priorities for %s"
-msgstr "Шаблоны ответов для: %s"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
-#, fuzzy
 msgid "Response Priority for %s"
-msgstr "Шаблоны ответов для: %s"
+msgstr ""
 
 #: templates/web/base/admin/template_edit.html:1
-#, fuzzy
 msgid "Response Template for %s"
-msgstr "Шаблоны ответов для: %s"
+msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "Шаблоны ответов для: %s"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -3043,8 +2982,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Искать обращения"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Искать пользователей"
 
@@ -3090,9 +3028,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr "Выберите тип уведомления,  а затем либо нажмите кнопку RSS-фида, либо введите свой адрес эл. почты, чтобы подписаться на рассылку уведомлений."
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Тема:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3136,9 +3073,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Автор публикации: %s, время публикации: %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3274,8 +3210,7 @@ msgstr "Статус:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3356,20 +3291,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Присылать мне уведомления по эл. почте"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Подробно опишите проблему"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Отправить изменения"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3436,9 +3368,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Спасибо за обновление данных по проблеме!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Благодарим вас за отзыв"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3674,15 +3605,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей <a href=\"/privacy\">политикой конфиденциальности.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/privacy\">политикой конфиденциальности.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3842,9 +3771,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Создано:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3981,9 +3909,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Используйте <strong>заметки</strong>, чтобы предоставить дополнительную информацию для администратора. Заметки не видны другим пользователям и не отправляются в органы самоуправления."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -4009,8 +3936,7 @@ msgstr "При поиске пользователей на сайте сист
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Пользователи"
 
@@ -4250,9 +4176,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Вы еще не создали ни одного обращения.  <a href=\"%s\">Самое время начать!</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Вы еще не создали ни одного обращения.  <a href=\"%s\">Самое время начать!</a>"
+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."
@@ -4274,9 +4199,8 @@ msgstr "Ваши обращения"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Подтвердить аккаунт"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4337,9 +4261,8 @@ msgstr "Ваши обращения"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Ваши обращения"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4347,9 +4270,8 @@ msgstr "Ваши обновления"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Ваш эл. адрес"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4446,9 +4368,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(необязательно)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4483,9 +4404,8 @@ msgid "reopened"
 msgstr "заново открыто"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "required"
-msgstr "Необходимо добавить фото"
+msgstr ""
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4623,45 +4543,3 @@ msgstr[0] "У нас пока <strong>нет</strong> подробной инф
 msgstr[1] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[2] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[3] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
-
-#~ msgid "(public)"
-#~ msgstr "(общедоступно)"
-
-#~ msgid "Additional Information"
-#~ msgstr "Дополнительная информация"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Информация, которую вы предоставляете, будет отправлена сюда:"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Информация, которую вы предоставляете, будет отправлена сюда: <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Настроить конечную точку"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Опишите, что пошло не так, где это произошло и как давно..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS в Google Картах"
-
-#~ msgid "One-line summary"
-#~ msgstr "Краткое резюме"
-
-#~ msgid "Survey"
-#~ msgstr "Опрос"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Итоги и описание смогут видеть все пользователи (см. нашу <a href=\"/privacy\">политику конфиденциальности</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "Мы никому не будем показывать ваш адрес эл. почты"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Мы никому не будем показывать ваш адрес эл. почты или номер телефона"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "В чем состояла неполадка и где она находилась?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Вы действительно хотите заново отправить обращение?"
diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
index 3b0a3e63c..fb2c07012 100644
--- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Altin Ukshini <altin.ukshini@gmail.com>, 2016
-# Egzon Mjeku <emjeku@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-06-21 14:12+0000\n"
-"Last-Translator: Altin Ukshini <altin.ukshini@gmail.com>\n"
-"Language-Team: Albanian (http://www.transifex.com/mysociety/fixmystreet/language/sq/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Granit Zhubi <granitzhubi@gmail.com>, 2016\n"
+"Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n"
 "Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +34,7 @@ msgstr "ose"
 
 #: templates/web/base/admin/edit-league.html:12
 msgid "%d edits by %s"
-msgstr "%d perpunuar nga %s"
+msgstr "%d përditësuar nga %s"
 
 #: templates/web/base/pagination.html:7
 msgid "%d to %d of %d"
@@ -50,11 +48,11 @@ msgstr "%s - Raportet përmbledhëse"
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
 msgid "%s admin:"
-msgstr ""
+msgstr "%s administruesi:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
-msgstr ""
+msgstr "%s drejtoria"
 
 #: templates/web/base/status/stats.html:24
 msgid "%s confirmed alerts, %s unconfirmed"
@@ -63,7 +61,7 @@ msgstr "%s sinjale të konfirmuara, %s te pa konfirmuara"
 #: 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 kontaktet e kuvendit &ndash; %s konfirmuar, %s pa konfirmuar"
 
 #. ("%s is the site name")
 #: templates/web/base/alert/index.html:7
@@ -72,6 +70,9 @@ 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 ka një shumëllojshmëri të RSS lajmeve dhe notifikimeve me e-mail për problemet\n"
+"lokale, duke përfshire notifikimet për të gjitha problemet në një lagje të caktuar apo të gjitha lagjet\n"
+"në një distancë të caktuar apo lokacion të caktuar."
 
 #. ("%s is the site name")
 #: templates/web/base/alert/index.html:11
@@ -80,6 +81,9 @@ 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 ka një shumëllojshmëri të RSS lajmeve dhe notifikimeve me e-mail për problemet\n"
+"lokale, duke përfshire notifikimet për të gjitha problemet në një lagje të caktuar apo të gjitha lagjet\n"
+"në një distancë të caktuar apo lokacion të caktuar."
 
 #: templates/web/base/status/stats.html:23
 msgid "%s live updates"
@@ -103,6 +107,8 @@ msgid ""
 "council&rsquo;s alerts, but will only appear in the \"Within the boundary\" alert\n"
 "for the county council."
 msgstr ""
+"%s dërgon kategori të ndryhme të problemit\n"
+"tek Drejtoria adekuate e Komunës, kështu që problemet që paraqiten jashtë Komunës perkatëse nuk do ti shkojnë asaj.  Si shembull një raport per graffiti do ti dërgohet Komunës, mirëpo do ti dërgohet vetëm Komunës së caktuar në hartë."
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
 msgid "%s ward, %s"
@@ -114,11 +120,11 @@ msgstr "%s, brenda lagjes %s"
 
 #: perllib/FixMyStreet/Map/OSM.pm:42
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
-msgstr ""
+msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> kontribuesit"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:21
 msgid "(Defect &amp; location of defect)"
-msgstr ""
+msgstr "(Defekt &amp; lokacioni i defektit)"
 
 #: templates/web/base/admin/report_blocks.html:41
 #: templates/web/base/admin/users.html:32
@@ -142,7 +148,7 @@ msgstr "(nje distance e paracaktuar e cila mbulon pothuajse 200,000 persona)"
 #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
 #: templates/web/base/alert/_list.html:30
 msgid "(alternatively the RSS feed can be customised, within %s)"
-msgstr ""
+msgstr "(Ndryshe RSS mund të personalizohet, brenda% s)"
 
 #: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
@@ -156,11 +162,11 @@ msgstr "(i rregulluar)"
 
 #: templates/web/base/around/intro.html:2
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
-msgstr ""
+msgstr "(Si mbishkrime, pllaka të thyera , ose ndriçimit të rrugëve)"
 
 #: templates/web/base/report/_item.html:21
 msgid "(not sent to council)"
-msgstr ""
+msgstr "(nuk ju dergua kuvendit)"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "(optional)"
@@ -182,7 +188,7 @@ msgstr "-- Zgjedh nje lloj te karakteristikes --"
 
 #: templates/web/base/admin/response_templates_select.html:4
 msgid "--Choose a template--"
-msgstr ""
+msgstr "--Zgjedh një template--"
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -204,6 +210,8 @@ msgstr ""
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
+"Paraqit\n"
+"për"
 
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
@@ -225,11 +233,11 @@ msgstr "<strong>Jo</strong> më lejo të kyqem me email"
 
 #: templates/web/base/report/_inspect.html:133
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
-msgstr ""
+msgstr "<Strong> Shënim: </ strong> Ky raport është dërguar tutje për veprim. Çdo ndryshim i bërë tutje nuk do të kalojë."
 
 #: templates/web/base/report/_inspect.html:135
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
-msgstr ""
+msgstr "<Strong> Shënim: </ strong> Ky raport nuk është dërguar ende në vazhdim për veprim. Çdo ndryshim i bërë nuk mund të kalohet."
 
 #: templates/web/base/auth/general.html:80
 #: templates/web/base/report/new/form_user_loggedout_password.html:3
@@ -251,6 +259,8 @@ msgid ""
 "          to which problem reports can be sent. You can add one or more contacts (for different\n"
 "          categories of problem) to each body."
 msgstr ""
+"Shto një <strong> drejtori</ strong> për secilin organ administrativ, të tilla si një këshill apo department.\n"
+"në të cilën raportet e problemit mund të dërgohen. Ju mund të shtoni një ose më shumë kontakte (për kategoritë e ndryshme të problemit) për secilin organ."
 
 #: templates/web/base/admin/body.html:60
 msgid "Add a contact using the form below."
@@ -260,7 +270,7 @@ msgstr "Shto nje kontakt duke perdorur formularin e meposhtem."
 #: templates/web/base/admin/body-form.html:138
 #: templates/web/zurich/admin/body-form.html:52
 msgid "Add body"
-msgstr ""
+msgstr "Shto trup"
 
 #: templates/web/base/admin/body.html:126
 #: templates/web/zurich/admin/body.html:31
@@ -271,7 +281,7 @@ msgstr "Shto një kategori të re"
 #: templates/web/base/report/_main.html:19
 #: templates/web/base/report/_main.html:27
 msgid "Add to shortlist"
-msgstr ""
+msgstr "Shto në listën e ngushtë"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
@@ -279,17 +289,16 @@ msgid "Add user"
 msgstr "Shto përdorues"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Shto një kategori të re"
+msgstr "Shto/përditëso kategoritë e problemeve"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
-msgstr ""
+msgstr "Shto/përditëso prioritetet e përgjigjeve"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
-msgstr ""
+msgstr "Shto/Përditëso përgjigjet nga template"
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -297,7 +306,7 @@ msgstr "Shtoi %s"
 
 #: templates/web/base/report/_main.html:141
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
-msgstr ""
+msgstr "Duke shtuar këtë raport në listën tuaj do të heqni atë nga lista %s''s e ngushtë."
 
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
@@ -309,7 +318,7 @@ msgstr "Paralajmerimi %d u krijua per %s, lloji %s, parametrat %s / %s"
 
 #: templates/web/base/admin/timeline.html:37
 msgid "Alert %d disabled (created %s)"
-msgstr ""
+msgstr "Notifikimi %d i ndalur (krijuar %s)"
 
 #: templates/web/base/report/update/form_name.html:38
 msgid "Alert me to future updates"
@@ -322,18 +331,16 @@ msgstr "Te gjitha Raportimet"
 
 #: templates/web/zurich/admin/stats.html:5
 msgid "All Reports as CSV"
-msgstr ""
+msgstr "Të gjitha raportet si CSV"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Te gjitha Raportimet"
+msgstr "Të gjitha kategoritë"
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Te gjitha raportimet"
@@ -359,9 +366,8 @@ msgstr "Anonim:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Shto përdorues"
+msgstr "Përdorues tjetër"
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -369,13 +375,12 @@ msgstr "A jeni nje zhvillues?"
 
 #: templates/web/base/js/translation_strings.html:53
 msgid "Are you sure you want to cancel this upload?"
-msgstr ""
+msgstr "Jeni te sigurte qe doni te anuloni këtë upload?"
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "A jeni nje zhvillues?"
+msgstr "A jeni të sigurtë?"
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -385,16 +390,16 @@ msgstr "Hapesire e mbuluar"
 
 #: templates/web/base/admin/user-form.html:64
 msgid "Area:"
-msgstr ""
+msgstr "Zona:"
 
 #: templates/web/base/admin/bodies.html:19
 #: templates/web/base/admin/body.html:64
 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 ""
+msgstr "derisa kjo faqe prezentuese eshte jo e vertete, raporti i bere ne faqe do te dergohet te raportuesi i problemit, jo kontakti i dhene per kategorine e raportit"
 
 #: templates/web/zurich/admin/report_edit.html:209
 msgid "Assign to competent body:"
-msgstr ""
+msgstr "Caktoja drejtorisë përkatëse: "
 
 #: templates/web/zurich/admin/report_edit.html:169
 #: templates/web/zurich/admin/stats.html:36
@@ -403,16 +408,15 @@ msgstr "Cakto per kategori te ndryshme:"
 
 #: templates/web/zurich/admin/report_edit.html:207
 msgid "Assign to external body:"
-msgstr ""
+msgstr "Caktoja një drejtorije të jashtme:"
 
 #: templates/web/zurich/admin/report_edit.html:186
 msgid "Assign to subdivision:"
 msgstr "Cakto per nenndarje:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Caktuar per %s"
+msgstr "Cakto përdorues për ëonat"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -420,7 +424,7 @@ msgstr "Caktuar per %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 ""
+msgstr "Në shumicën %d kërkesave janë kthyer në çdo pyetje. Kërkesat e kthyera janë urdhëruar nga requested_datetime, në mënyrë që të marrë të gjitha kërkesat, të bëjë disa kërkime me START_DATE dhe END_DATE."
 
 #: templates/web/base/open311/index.html:68
 msgid "At the moment only searching for and looking at reports work."
@@ -429,21 +433,20 @@ msgstr "Per momentin funksionon vetem kerkimi dhe  shikimi i raportimeve."
 #: templates/web/base/admin/user-form.html:78
 #: templates/web/base/admin/user-form.html:79
 msgid "Authorised staff users can be associated with the categories in which they operate."
-msgstr ""
+msgstr "Përdoruesit e stafit te autorizuar mund të jenë të lidhur me kategoritë në të cilat operojnë."
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Pergjigje publike:"
+msgstr "Përgjigje-Automatike:"
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
 msgid "Available categories"
-msgstr ""
+msgstr "Kategoritë në dispozicion"
 
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
-msgstr ""
+msgstr "Shmangni të dhënat personale dhe targat e automjeteve"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:401
 #: templates/web/zurich/report/_item.html:9
@@ -455,9 +458,8 @@ msgid "Back"
 msgstr "Prapa"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Te gjitha raportimet"
+msgstr "Prapa te të gjitha raportet"
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -470,18 +472,18 @@ msgstr "bllokoemail adresen"
 #: templates/web/base/admin/report_edit.html:55
 #: templates/web/zurich/header.html:56
 msgid "Bodies"
-msgstr ""
+msgstr "Drejtoritë"
 
 #: templates/web/base/admin/flagged.html:17
 #: templates/web/base/admin/index.html:57
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
-msgstr ""
+msgstr "Drejtori"
 
 #: templates/web/base/admin/user-form.html:36
 msgid "Body:"
-msgstr ""
+msgstr "Drejtori"
 
 #: templates/web/base/admin/stats.html:87
 msgid "By Date"
@@ -489,7 +491,7 @@ msgstr "Nga Data"
 
 #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr ""
+msgstr "Nuk mund ta gjeni emailin tonë? Kontrolloni folderin spam ne e-mail. Kjo është zgjidhja për 99% të rasteve."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
@@ -497,18 +499,16 @@ msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>"
 
 #: templates/web/base/report/_inspect.html:141
 msgid "Cancel"
-msgstr ""
+msgstr "Anulo"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategoria"
+msgstr "Kategoritë"
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategoria:"
+msgstr "Kategoritë:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -525,14 +525,13 @@ msgid "Category"
 msgstr "Kategoria"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "p.sh. ‘%s’ ose ‘%s’"
+msgstr "Kategoria u ndryshua nga '%s' në '%s'"
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
 msgid "Category fix rate for problems > 4 weeks old"
-msgstr ""
+msgstr "Norma e rregullimit të kategorive për problemet > 4 javë"
 
 #: templates/web/base/admin/report_edit.html:125
 #: templates/web/zurich/admin/body.html:43
@@ -548,14 +547,13 @@ msgstr "Kategoria: %s"
 
 #: templates/web/base/my/my.html:24
 msgid "Change email"
-msgstr ""
+msgstr "Ndrysho email"
 
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "bllokoemail adresen"
+msgstr "Ndrysho email adresën"
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -570,16 +568,20 @@ msgid ""
 "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
 "                If you are not sure of the origin or validity of the contact, leave this unchecked."
 msgstr ""
+"Kontrollo<strong>konfirmuar</strong>për të treguar që ky kontakt është konfirmuar si korrekt.\n"
+"Nëse nuk jeni të sigurte në origjinen ose validitetin e kontaktit, mos e plotësoni këtë."
 
 #: templates/web/base/admin/contact-form.html:52
 msgid ""
 "Check <strong>deleted</strong> to remove the category from use. \n"
 "        It will not appear as an available category in the drop-down menu on the report-a-problem page."
 msgstr ""
+"Kontrolloni <strong> delete</ strong> për të hequr kategorinë nga përdorimi.\n"
+"Kjo nuk do të shfaqet si një kategori në dispozicion në drop-down menu në faqen Raportet e problemeve."
 
 #: templates/web/base/admin/contact-form.html:79
 msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
-msgstr ""
+msgstr "Kontrolloni <strong> aty ku inspektimi kërkohet </ strong> në qoftë se raportet në këtë kategori <strong> duhet të inspektohen </ strong> përpara se të dërgohet."
 
 #: templates/web/base/admin/contact-form.html:63
 msgid ""
@@ -591,12 +593,22 @@ msgid ""
 "                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 ""
+"Shënoni<strong> private </ strong> në qoftë se raportet në këtë kategori nuk duhet të <strong> të shfaqen në faqen e internetit </ strong> .\n"
+"<br>\n"
+"Normalisht, kategori nuk janë private.\n"
+"<br>\n"
+"Kjo është e përshtatshme për çështje që ju dëshironi për të lejuar përdoruesit për të raportuar për Drejtoritë, por për të cilat nuk ka\n"
+"Interes publik në shfaqjen e raportit. Në Mbretërinë e Bashkuar, ne kemi përdorur këtë për shërbime si të kërkuar një kosh\n"
+"shtesë të mbeturinave\n"
+"në një adresë të veçantë."
 
 #: templates/web/base/admin/contact-form.html:11
 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 ""
+"Zgjidhni një emër të<strong> kategorisë </ strong> emër që ka kuptim për publikun (p.sh., \"\", \"ndriçimi publik\",\"Rruga Lokale\"), por është i kuptueshëm edhe për\n"
+"Drejtorinë. Këto do të shfaqen në drop-down menynë në faqen Raportimit të problemeve."
 
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
@@ -609,19 +621,19 @@ msgstr "Kliko ne harte per te raportuar nje problem"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
-msgstr ""
+msgstr "Klikoni linkun në emailin e konfirmimit që ti aktivizoni njoftimet."
 
 #: templates/web/base/email_sent.html:9
 msgid "Click the link in our confirmation email to publish your problem."
-msgstr ""
+msgstr "Klikoni linkun në emailin e konfirmimit që ta publikoni problemin tuaj."
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr ""
+msgstr "Klikoni linkun në emailin konfirmues që të publikoni përditësimin tuaj."
 
 #: templates/web/base/auth/token.html:18
 msgid "Click the link in our confirmation email to sign in."
-msgstr ""
+msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur."
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
@@ -640,12 +652,11 @@ msgstr "Mbyllur"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:809
 msgid "Closed by council"
-msgstr ""
+msgstr "Mbyllur nga këshilli."
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Ridergo raportin"
+msgstr "Raporte të mbyllura"
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -653,7 +664,7 @@ msgstr "Mbyllur:"
 
 #: templates/web/base/admin/report_edit.html:37
 msgid "Co-ordinates:"
-msgstr ""
+msgstr "Koordinatat:"
 
 #: templates/web/base/admin/list_updates.html:10
 msgid "Cobrand"
@@ -672,7 +683,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurimi"
 
 #: templates/web/base/admin/body.html:77
 msgid "Confirm"
@@ -685,7 +696,7 @@ msgstr "Konfirmo llogarine"
 #: templates/web/base/report/new/form_user_loggedout_password.html:21
 #: templates/web/base/report/update/form_user_loggedout_password.html:20
 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
-msgstr ""
+msgstr "Konfirmo me e-mail, duke siguruar një fjalëkalim të ri në atë pikë. Kur ju konfirmoni, fjalëkalimi do të rifreskohet."
 
 #: templates/web/base/questionnaire/creator_fixed.html:1
 #: templates/web/base/tokens/confirm_problem.html:1
@@ -715,7 +726,7 @@ msgstr "E konfirmuar:"
 #. ("%s is the site name")
 #: templates/web/base/about/_sidebar.html:6
 msgid "Contact %s"
-msgstr ""
+msgstr "Kontaktet %s"
 
 #: templates/web/base/contact/index.html:1
 #: templates/web/base/contact/index.html:2
@@ -730,7 +741,7 @@ msgstr "Kontakto ekipin"
 #: templates/web/zurich/admin/report_edit-sdm.html:42
 #: templates/web/zurich/admin/report_edit.html:61
 msgid "Coordinates:"
-msgstr ""
+msgstr "Koordinatat:"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1649
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1677
@@ -743,13 +754,13 @@ msgstr "nuk mund ta shikoni vendndodhjen"
 
 #: templates/web/base/admin/list_updates.html:9
 msgid "Council"
-msgstr ""
+msgstr "Këshilli"
 
 #: templates/web/base/admin/body.html:1
 #: templates/web/base/admin/category_edit.html:1
 #: templates/web/zurich/admin/body.html:1
 msgid "Council contacts for %s"
-msgstr ""
+msgstr "Kontaktet e kuvendit për %s"
 
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
@@ -757,14 +768,14 @@ msgstr ""
 
 #: templates/web/base/admin/stats.html:92
 msgid "Council:"
-msgstr ""
+msgstr "Kuvendi:"
 
 #: templates/web/base/admin/stats.html:12
 #: templates/web/base/admin/stats.html:32
 #: templates/web/zurich/admin/stats.html:45
 #: templates/web/zurich/admin/stats.html:50
 msgid "Count"
-msgstr ""
+msgstr "Numëro"
 
 #: templates/web/base/email_sent.html:1
 msgid "Create a report"
@@ -776,22 +787,21 @@ msgid "Create category"
 msgstr "Krijo kategorine"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Krijo nje raport"
+msgstr "Krijo prioritet"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "Create reports/updates as the council"
-msgstr ""
+msgstr "Krijo raporte/përditësime si Kuvend Komunal"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
-msgstr ""
+msgstr "Krijo raport/përditësim në emër të shfrytëzuesit"
 
 #: templates/web/base/admin/template_edit.html:36
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
-msgstr ""
+msgstr "Krijo template"
 
 #: templates/web/base/admin/problem_row.html:34
 #: templates/web/base/admin/templates.html:12
@@ -817,22 +827,22 @@ msgstr "Aktualisht asnje grup nuk eshte krijuar."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:825
 #: templates/web/zurich/admin/report_edit-sdm.html:105
 msgid "Customer not contactable"
-msgstr ""
+msgstr "Klienti nuk mund të kontaktohet"
 
 #: templates/web/base/dashboard/index.html:5
 #: templates/web/base/dashboard/index.html:7
 msgid "Dashboard"
-msgstr ""
+msgstr "Paneli"
 
 #: templates/web/zurich/admin/stats.html:35
 msgid "Dealt with by subdivision within 5 working days"
-msgstr ""
+msgstr "Trajtohet nga nën-drejtoritë brenda 5 ditëve të punës"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
 #: templates/web/base/admin/template_edit.html:40
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
-msgstr ""
+msgstr "Fshije template"
 
 #: templates/web/base/admin/bodies.html:31
 #: templates/web/base/admin/body.html:87
@@ -840,19 +850,18 @@ msgstr ""
 #: templates/web/base/admin/contact-form.html:58
 #: templates/web/zurich/admin/contact-form.html:12
 msgid "Deleted"
-msgstr ""
+msgstr "E fshirë"
 
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
 #: templates/web/zurich/admin/reports.html:12
 msgid "Description"
-msgstr "Pershkrim"
+msgstr "Përshkrim"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Pershkrim"
+msgstr "Përshkrimi:"
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -873,7 +882,7 @@ msgstr "Transferuar"
 #: templates/web/zurich/admin/report_edit-sdm.html:52
 #: templates/web/zurich/admin/report_edit.html:71
 msgid "Didn't use map"
-msgstr ""
+msgstr "Nuk e përdori hartën"
 
 #: templates/web/base/admin/edit-league.html:8
 msgid "Diligency prize league table"
@@ -881,7 +890,7 @@ msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
-msgstr ""
+msgstr "Mos dërgo notifikime me email ne komentet e marra nga lajmëruesi i problemit"
 
 #. ("%s is the site name")
 #: templates/web/base/auth/general.html:58
@@ -890,7 +899,7 @@ msgstr ""
 #: templates/web/base/report/update-form.html:30
 #: templates/web/base/report/update/form_user_loggedout.html:27
 msgid "Do you have a %s password?"
-msgstr ""
+msgstr "A keni vondosur nje %s fjalëkalim ?"
 
 #: templates/web/base/questionnaire/index.html:57
 msgid "Don&rsquo;t know"
@@ -902,7 +911,7 @@ msgstr "Nuk i'u pelqen kjo forme?"
 
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
-msgstr ""
+msgstr "Merr dhe lësho fotot këtu ose <u>kliko për të ngarkuar foto</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
@@ -918,10 +927,13 @@ msgid ""
 "            This means you can add many categories even if you only have one contact for the body.\n"
 "    "
 msgstr ""
+"Çdo kontakt ka një kategori, e cila është shfaqur në publik.\n"
+"kategoritë të ndryshme <strong> mund të kenë të njëjtin kontakt </ strong> (adresë e-mail).\n"
+"Kjo do të thotë që ju mund të shtoni shumë kategori edhe në qoftë se ju keni vetëm një kontakt për llojin e problemit"
 
 #: templates/web/base/report/_inspect.html:16
 msgid "Easting/Northing:"
-msgstr ""
+msgstr "Lëvizje drejtë Lindjes/Veriut:"
 
 #: templates/web/base/admin/list_updates.html:42
 #: templates/web/base/admin/problem_row.html:41
@@ -930,37 +942,33 @@ msgstr ""
 #: templates/web/base/admin/users.html:34
 #: templates/web/zurich/admin/problem_row.html:48
 msgid "Edit"
-msgstr ""
+msgstr "Përditëso"
 
 #: templates/web/base/admin/body.html:140
 #: templates/web/base/admin/index.html:35
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
-msgstr ""
+msgstr "Përditëso detajet:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Perfshire te dhenat personale te raportuesit"
+msgstr "Përditëso detajet e përdoruesit"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
-msgstr ""
+msgstr "Përditëso autorizimet e përdoruesit"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Krijo kategorine"
+msgstr "Përditëso kategorinë e raporteve"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Filtro listen e raporteve"
+msgstr "Përditëso prioritetin e raportit"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Te gjitha raportimet"
+msgstr "Përditëso raportet"
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -970,16 +978,16 @@ msgstr "Te gjitha raportimet"
 #: templates/web/zurich/admin/report_edit.html:1
 #: templates/web/zurich/admin/report_edit.html:5
 msgid "Editing problem %d"
-msgstr ""
+msgstr "Përditëso problemin %d"
 
 #: templates/web/base/admin/update_edit.html:1
 #: templates/web/zurich/admin/update_edit.html:1
 msgid "Editing update %d"
-msgstr ""
+msgstr "Ndryshim i përditësimit"
 
 #: templates/web/base/admin/user_edit.html:2
 msgid "Editing user %d"
-msgstr ""
+msgstr "Përditëso përdoruesin %d"
 
 #: templates/web/base/admin/category_edit.html:56
 msgid "Editor"
@@ -1004,21 +1012,20 @@ msgstr "Emaili u shtua te lista e abuzimeve"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Email adresa:"
+msgstr "Email adresa"
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
-msgstr ""
+msgstr "Notifikimi me email u krijua"
 
 #: templates/web/base/tokens/confirm_alert.html:10
 msgid "Email alert deleted"
-msgstr ""
+msgstr "Notifikimi me email u fshi"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1622
 msgid "Email already in abuse list"
-msgstr ""
+msgstr "Emaili tanimë është në listë e abuzuesve"
 
 #: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/update_edit.html:35
@@ -1055,25 +1062,25 @@ msgstr "Data e fundit:"
 
 #: templates/web/base/admin/open311-form-fields.html:21
 msgid "Endpoint"
-msgstr ""
+msgstr "Pika e fundit"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:76
 msgid "Enter a Z&uuml;rich street name"
-msgstr ""
+msgstr "Shkruaj një Z&uuml;rich emër të rrugës "
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:14
 msgid "Enter a nearby UK postcode, or street name and area"
-msgstr ""
+msgstr "Shkruani një emër të rrugës apo zonë."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21
 msgid "Enter a nearby postcode, or street name and area"
-msgstr ""
+msgstr "Shkruani një emër të rrugës apo zonë"
 
 #: templates/web/base/around/postcode_form.html:5
 #: templates/web/base/around/postcode_form.html:6
 msgid "Enter a nearby street name and area"
-msgstr ""
+msgstr "Shkruani emrin e rrugës pranë jush dhe zonës"
 
 #: templates/web/base/auth/general.html:116
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:35
@@ -1098,7 +1105,7 @@ msgstr "Gabim"
 #: templates/web/base/reports/_list-filters.html:11
 #: templates/web/base/reports/_list-filters.html:19
 msgid "Everything"
-msgstr ""
+msgstr "Çdo gjë"
 
 #: templates/web/base/admin/body.html:18
 #: templates/web/base/admin/category_edit.html:18
@@ -1111,37 +1118,35 @@ msgstr "Shembuj:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Krijo kategorine"
+msgstr "Kategori ekzistuese"
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
-msgstr ""
+msgstr "Shpjego çfarë është gabim"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:12
 msgid "Extern"
-msgstr ""
+msgstr "i jashtëm"
 
 #: templates/web/base/admin/report_edit.html:97
 msgid "External ID"
-msgstr ""
+msgstr "ID e jashtme"
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
-msgstr ""
+msgstr "URL i jashtëm"
 
 #: templates/web/base/admin/report_edit.html:99
 msgid "External body"
-msgstr ""
+msgstr "Drejtori e jashtme"
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Shenim i brendshem"
+msgstr "Ekipi i jashtëm"
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1149,13 +1154,12 @@ msgid "Extra data:"
 msgstr "Te dhena shtese:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Te dhena shtese:"
+msgstr "Ekstra detajet"
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
-msgstr ""
+msgstr "Nuk arriti të dërgojë mesazh"
 
 #: templates/web/zurich/admin/index-dm.html:33
 #: templates/web/zurich/admin/index-sdm.html:30
@@ -1168,7 +1172,7 @@ msgstr "Emri"
 
 #: templates/web/base/admin/body.html:52
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
-msgstr ""
+msgstr "Rregulloni këtë duke zgjedhur një <strong> zonë të mbuluar </ strong> në detajet e trupit <em> Ndrysho </ em> formularin e mëposhtëm."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:24
@@ -1185,7 +1189,7 @@ msgstr "E rregulluar"
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:11
 msgid "Fixed - Council"
-msgstr ""
+msgstr "E rregulluar - Këshilli"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
@@ -1193,9 +1197,8 @@ msgid "Fixed - User"
 msgstr "E rregulluar - Perdoruesi"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Raportime te reja"
+msgstr "Raportimet që janë rregulluar"
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1205,7 +1208,7 @@ msgstr "E rregulluar:"
 #: templates/web/base/admin/responsepriorities/edit.html:31
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
-msgstr ""
+msgstr "E fshirë"
 
 #: templates/web/base/admin/report_blocks.html:46
 msgid "Flag user"
@@ -1214,46 +1217,46 @@ msgstr "Flamuri i perdoruesit"
 #: perllib/FixMyStreet/Cobrand/Default.pm:645
 #: templates/web/base/admin/users.html:20
 msgid "Flagged"
-msgstr ""
+msgstr "E shënjuar"
 
 #: templates/web/base/admin/flagged.html:1
 msgid "Flagged reports and users"
-msgstr ""
+msgstr "Raportet dhe përdoruesit e shënjuar"
 
 #: templates/web/base/admin/user-form.html:94
 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
-msgstr ""
+msgstr "Përdoruesit e shënjuar janë të listuar në <a href='%s'> faqen e shënimeve</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 "Përdoruesit e shënjuar nuk janë të kufizuar në asnjë mënyrë. Kjo është vetëm një listë e përdoruesve që kanë qenë të shënuar për vëmendje të mëtutjeshme."
 
 #: templates/web/base/admin/report_edit.html:153
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
-msgstr ""
+msgstr "Shënjuar:"
 
 #: templates/web/base/reports/_ward-list.html:4
 msgid "Follow a ward link to view only reports within that ward."
-msgstr ""
+msgstr "Ndiqni një link të lagjes për të parë raportet vetëm brenda asaj lagje."
 
 #: templates/web/base/report/new/after_photo.html:3
 msgid "For best results include a close-up and a wide shot"
-msgstr ""
+msgstr "Për rezultate më të mira përfshijë një close-up dhe wide-shot"
 
 #: templates/web/base/admin/body-form.html:71
 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
-msgstr ""
+msgstr "Për më shumë informata, shih <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'> Si e përdorë FixMyStreet platformën Mapit </a>."
 
 #: templates/web/base/auth/general.html:95
 #: templates/web/base/report/new/form_user_loggedout_password.html:20
 #: templates/web/base/report/update/form_user_loggedout_password.html:19
 msgid "Forgotten your password?"
-msgstr "Keni harruar fjalekalimin tuaj?"
+msgstr "Keni harruar fjalëkalimin tuaj?"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:743
 msgid "Forwarded to external body"
-msgstr ""
+msgstr "Përcjellur tek drejtoria e jashtme"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:744
 msgid "Forwarded wish to external body"
@@ -1263,7 +1266,7 @@ msgstr ""
 #: templates/web/base/about/faq-en-gb.html:1
 #: templates/web/base/about/faq-en-gb.html:5
 msgid "Frequently Asked Questions"
-msgstr "Pyetjet me te shpeshta"
+msgstr "Pyetjet më të shpeshta"
 
 #: templates/web/base/around/_updates.html:3
 #: templates/web/base/report/display_tools.html:12
@@ -1286,7 +1289,7 @@ msgstr "Me jep mua nje RSS feed"
 
 #: templates/web/base/questionnaire/completed.html:14
 msgid "Glad to hear it’s been fixed!"
-msgstr ""
+msgstr "Jemi të kënaqur që është regulluar!"
 
 #: templates/web/base/admin/index.html:45
 #: templates/web/base/alert/index.html:34
@@ -1299,19 +1302,19 @@ msgstr "Vazhdo"
 
 #: templates/web/base/admin/report_edit.html:95
 msgid "Going to send questionnaire?"
-msgstr ""
+msgstr "Do dërgoni pyetsorin?"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
-msgstr ""
+msgstr "Lejoni akses për administratorin"
 
 #: templates/web/base/admin/index.html:70
 msgid "Graph of problem creation by status over time"
-msgstr ""
+msgstr "Grafi i problemeve të krijuara në bazë të statusit gjatë kohës"
 
 #: templates/web/base/reports/index.html:15
 msgid "Greyed-out lines are councils that no longer exist."
-msgstr ""
+msgstr "Linjat gri janë këshillet që nuk ekzistojnë më."
 
 #: templates/web/base/questionnaire/index.html:48
 msgid "Has this problem been fixed?"
@@ -1319,19 +1322,19 @@ msgstr "A ka qene i rregulluar ky problem?"
 
 #: templates/web/base/questionnaire/index.html:61
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
-msgstr ""
+msgstr "A keni raportuar ndonjë problem më herët për këshillin apo kjo është hera e parë?"
 
 #: templates/web/base/footer.html:35
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
 msgid "Help"
-msgstr "Ndihme"
+msgstr "Ndihmë"
 
 #: templates/web/base/report/new/category_extras.html:13
 #: templates/web/base/report/new/category_extras.html:14
 msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
-msgstr ""
+msgstr "Na ndihmoni të zgjedhim problemin tuaj më shpejtë duke na dhënë disa të dhëna më shumë. Këto të dhëna shtesë nuk publikohen online."
 
 #: templates/web/base/alert/_list.html:9
 msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
@@ -1355,11 +1358,11 @@ msgstr "E fshehur"
 
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
-msgstr "Fshih te vjetratt"
+msgstr "Fshih të vjetrat"
 
 #: templates/web/base/around/display_location.html:62
 msgid "Hide pins"
-msgstr "Fshih shenjen"
+msgstr "Fshih shenjën"
 
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
@@ -1371,7 +1374,7 @@ msgstr "Kryefaqja"
 
 #: templates/web/base/index-steps.html:1
 msgid "How to report a problem"
-msgstr "Si te raportoj nje problem"
+msgstr "Si të raportoj një problem"
 
 #: templates/web/base/js/translation_strings.html:32
 msgid "How to send successful reports"
@@ -1380,12 +1383,12 @@ msgstr "Si te dergoj nje raport ne menyre te sukseshme"
 #: templates/web/base/tokens/confirm_problem.html:36
 #: templates/web/base/tokens/confirm_problem.html:40
 msgid "I just reported a problem on @fixmystreet"
-msgstr ""
+msgstr "Unë sapo raportova një problem në @rregullorrugëntime"
 
 #: templates/web/base/tokens/confirm_update.html:19
 #: templates/web/base/tokens/confirm_update.html:23
 msgid "I just updated a problem on @fixmystreet"
-msgstr ""
+msgstr "Unë sapo përditësova një poroblem në @rregullorrugëntime"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
@@ -1418,30 +1421,32 @@ 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 ""
+msgstr "Nëse merrni më shumë informata për gjendjën e problemit tuaj, ju lutem kthehuni në faqe dhe leni një përditësim."
 
 #: templates/web/base/admin/responsepriorities/edit.html:23
 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 ""
+msgstr "Nëse ju dëshironi vetëm  që ky prioritet të jetë një alternativë për kategori të veçanta, merr ato këtu. By default ata do të tregojnë për të gjitha kategoritë"
 
 #: templates/web/base/admin/template_edit.html:29
 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 ""
+msgstr "Nëse ju vetëm dëshironi që kjo template të jetë një alternativë për kategori të veçanta, merr ato këtu. By default ajo do të tregojë të gjitha kategoritë."
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr ""
+msgstr "Në qoftë se ju do të paraqitni një problem këtu ,problemi do të <strong> nuk </ strong> të raportohet në këshill."
 
 #: templates/web/base/questionnaire/index.html:70
 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 ""
+"Nëse ju dëshironi një përditësim publik mbi problemin, ju lutem shkruani atë këtu\n"
+"(Ju lutem vini re problemi nuk do ti dërgohet  këshillit)."
 
 #: templates/web/base/admin/contact-form.html:30
 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
-msgstr ""
+msgstr "Nëse jeni duke përdorur <strong> një metodë të dërgimit që nuk është email </ strong>, futni ID-në e shërbimit (Open311) ose identifikues ekuivalent këtu."
 
 #: templates/web/base/admin/open311-form-fields.html:100
 #: templates/web/base/admin/open311-form-fields.html:101
@@ -1497,11 +1502,11 @@ msgstr ""
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
-msgstr "Ne vazhdim"
+msgstr "Në vazhdim"
 
 #: templates/web/base/tokens/confirm_alert.html:11
 msgid "Inbox zero, here we come!"
-msgstr ""
+msgstr "Inboksi zero, ja ku erdhëm!"
 
 #: templates/web/zurich/admin/report_edit.html:223
 msgid "Include reporter personal details"
@@ -1513,15 +1518,15 @@ msgstr "Perfshire raportimet e pakonfirmuara"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:360
 msgid "Incorrect has_photo value \"%s\""
-msgstr ""
+msgstr "Gabim ka_foto value \"%s\""
 
 #: templates/web/base/admin/contact-form.html:84
 msgid "Inspection required"
-msgstr ""
+msgstr "Inspektimi kërkohet"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
-msgstr ""
+msgstr "Instrukto kontraktorët të rregullojnë problemet"
 
 #: templates/web/zurich/admin/list_updates.html:35
 msgid "Internal notes"
@@ -1534,7 +1539,7 @@ msgstr "Rekomandim i brendshem"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:345
 msgid "Invalid agency_responsible value %s"
-msgstr ""
+msgstr "Vlerë agency_responsible e gabuar %s"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1483
 msgid "Invalid end date"
@@ -1542,11 +1547,11 @@ msgstr "Data e fundit jovalide"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:438
 msgid "Invalid format %s specified."
-msgstr ""
+msgstr "Format jo i vlefshëm %s i specifikuar."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:361
 msgid "Invalid location. New location must be covered by the same council."
-msgstr ""
+msgstr "Lokacion jo valid. Lokacioni i ri duhet të mbulohet nga i njëjti këshill."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1479
 msgid "Invalid start date"
@@ -1564,32 +1569,34 @@ msgstr "Shqyrtuar"
 #: templates/web/base/contact/blurb.html:8
 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
 msgstr ""
+"Kjo është shpesh mënyrIt's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there.\n"
+"a  më e shpejtë për të kontrolluar <a href=\"%s\"> Faktet </a> tona dhe të shihni nëse përgjigja është atje,"
 
 #: templates/web/base/tokens/confirm_problem.html:27
 msgid "It’s on its way to the council right now."
-msgstr ""
+msgstr "Kjo është në rrugën e saj drejtë këshillit tani."
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:177
 msgid "Jurisdiction Unknown"
-msgstr ""
+msgstr "Juridiksioni i panjohur"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:918
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:15
 msgid "Jurisdiction unknown"
-msgstr ""
+msgstr "Juridiksion i pa njohur"
 
 #: templates/web/base/auth/general.html:91
 #: templates/web/base/report/new/form_user_loggedout_password.html:16
 #: templates/web/base/report/update/form_user_loggedout_password.html:15
 #: templates/web/zurich/auth/general.html:40
 msgid "Keep me signed in on this computer"
-msgstr "Me mbaj te kyqur ne kete kompjuter"
+msgstr "Më mbaj të kyqur në këtë kompjuter"
 
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
-msgstr ""
+msgstr "Edituesi i fundit"
 
 #: templates/web/base/admin/report_edit.html:89
 msgid "Last update:"
@@ -1600,13 +1607,12 @@ msgid "Last&nbsp;update:"
 msgstr "Perditesimi&nbsp;fundit:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Perditesimi i fundit:"
+msgstr "I përditësuar kohët e fundit"
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
-msgstr ""
+msgstr "Lini bosh këtë në qoftë se të gjitha raportet në këtë organ duhet të dërgohen duke përdorur të njëjtën metodë të dërgimit (p.sh., \"%s\")."
 
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
@@ -1617,10 +1623,9 @@ msgid "Loading..."
 msgstr "Duke ngarkuar..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 ""
@@ -1632,11 +1637,11 @@ msgstr ""
 
 #: templates/web/base/footer.html:32
 msgid "Local alerts"
-msgstr ""
+msgstr "Njoftimet lokale"
 
 #: templates/web/base/index-steps.html:5
 msgid "Locate the problem on a map of the area"
-msgstr "Lokalizo problemin ne harte ne vendin e caktuar"
+msgstr "Lokalizo problemin në hartë në vendin e caktuar"
 
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
@@ -1644,15 +1649,15 @@ msgstr "HARTA"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Manage shortlist"
-msgstr ""
+msgstr "Menaxhoni listën e shkurtë"
 
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
-msgstr ""
+msgstr "Harta"
 
 #: templates/web/base/admin/report_edit.html:86
 msgid "Mark as sent"
-msgstr ""
+msgstr "Shëno si të dërguar"
 
 #: templates/web/base/admin/user-form.html:92
 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
@@ -1660,11 +1665,11 @@ msgstr ""
 
 #: templates/web/base/reports/index.html:27
 msgid "Marked fixed/closed in the past eight weeks"
-msgstr ""
+msgstr "Shëno si të rregulluar/mbyllyr në 8 javët e kaluara"
 
 #: templates/web/base/reports/index.html:28
 msgid "Marked fixed/closed more than eight weeks ago"
-msgstr ""
+msgstr "Shëno si të rregulluar/mbyllyr në më shumë se 8 javë"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Markup problem details"
@@ -1676,37 +1681,35 @@ msgstr "Mesazh"
 
 #: templates/web/zurich/admin/report_edit.html:280
 msgid "Message to competent body:"
-msgstr ""
+msgstr "Mesazhi për drejtorinë kompetente:"
 
 #: templates/web/zurich/admin/report_edit.html:278
 msgid "Message to external body:"
-msgstr ""
+msgstr "Mesazh për një drejtori të jashtme"
 
 #: templates/web/base/admin/report_edit.html:71
 msgid "Missing bodies:"
-msgstr ""
+msgstr "Mungojnë drejtori:"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:446
 msgid "Missing jurisdiction_id"
-msgstr ""
+msgstr "Mungesë juridiksioni_id"
 
 #: templates/web/base/report/_main.html:126
 msgid "Moderate"
-msgstr ""
+msgstr "Mesatare"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Perfshire te dhenat personale te raportuesit"
+msgstr "Raportet e detajuara mesatare"
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Krijo nje raport"
+msgstr "Moderoni këtë raport"
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
-msgstr ""
+msgstr "Moderuar me divizion brenda një ditë pune"
 
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
@@ -1714,7 +1717,7 @@ msgstr "Muaji"
 
 #: templates/web/base/reports/_list-filters.html:39
 msgid "Most commented"
-msgstr ""
+msgstr "Më të komentuarat"
 
 #: templates/web/base/admin/bodies.html:25
 #: templates/web/base/admin/body-form.html:24
@@ -1749,50 +1752,48 @@ msgid "Name: %s"
 msgstr "Emri: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS feed per te rejat rreth ketij problemi"
+msgstr "Shko tek ky problem"
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
-msgstr ""
+msgstr "Rruga më e afërt me emërtim e llogaritur nga pin në hartë (gjenerohet automatikisht duke përdorur OpenStreetMap): %s%s"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:128
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
-msgstr ""
+msgstr "Kodi postar më i afërt  nga pin i vendosur në hartë (gjenerohet automatikisht): %s (%sm jasht)"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:527
 #: perllib/FixMyStreet/Cobrand/Default.pm:567
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
-msgstr ""
+msgstr "Rruga më e afërt e llogaritur nga pin në hartë (gjenerohet automatikisht nga Bing Maps): %s"
 
 #: perllib/FixMyStreet/Script/Alerts.pm:323
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
-msgstr ""
+msgstr "Rruga më e afërt e llogaritur nga pin në hartë (gjenerohet automatikisht nga Bing Maps): %s\n"
 
 #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5
 msgid "Nearly done! Now check your email&hellip;"
-msgstr ""
+msgstr "Gati e përfunduar! Tani kontrolloni emailin tuaj"
 
 #: templates/web/base/reports/index.html:24
 msgid "New <br>problems"
-msgstr ""
+msgstr "Probleme<br> të reja"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:259
 msgid "New body added"
-msgstr ""
+msgstr "Drejtori e re e shtuar"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:405
 msgid "New category contact added"
-msgstr ""
+msgstr "Kategori e re e kontakteve e shtuar"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Email adresa:"
+msgstr "Email adresa e re "
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1805,18 +1806,16 @@ msgstr "Problem i ri lokal ne FixMyStreet"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:113
 msgid "New note to DM:"
-msgstr ""
+msgstr "Shënim i ri për DM"
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Fjalekalimi:"
+msgstr "Fjalëkalim i ri"
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Raportime te reja"
+msgstr "Prioritete të reja"
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1824,7 +1823,7 @@ msgstr ""
 
 #: db/alert_types.pl:26 db/alert_types.pl:30
 msgid "New problems near {{POSTCODE}} on FixMyStreet"
-msgstr ""
+msgstr "Probleme të reja afër {{KODIPOSTAR}}  në Rregullorrugëntime"
 
 #: db/alert_types.pl:10
 msgid "New problems on FixMyStreet"
@@ -1836,7 +1835,7 @@ msgstr "Probleme te reja per {{COUNCIL}} ne FixMyStreet"
 
 #: db/alert_types.pl:42
 msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
-msgstr ""
+msgstr "Probleme të reja brenda kufinjëve në RegulloRRugënTime"
 
 #: templates/web/zurich/admin/index-sdm.html:4
 msgid "New reports"
@@ -1850,11 +1849,11 @@ msgstr "Gjendje e re"
 #: templates/web/base/admin/templates.html:28
 #: templates/web/zurich/admin/template_edit.html:9
 msgid "New template"
-msgstr ""
+msgstr "Shabllon i ri"
 
 #: templates/web/base/reports/_list-filters.html:35
 msgid "Newest"
-msgstr ""
+msgstr "Më e reja"
 
 #: templates/web/base/pagination.html:10
 msgid "Next"
@@ -1877,21 +1876,20 @@ msgid "No"
 msgstr "Jo"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "zona tjera:"
+msgstr "Ska zonë"
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
-msgstr ""
+msgstr "Ska drejtori"
 
 #: templates/web/base/admin/stats.html:93
 msgid "No council"
-msgstr ""
+msgstr "Ska council"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:429
 msgid "No council selected"
-msgstr ""
+msgstr "Asnjë council  e zgjedhur"
 
 #: templates/web/base/admin/edit-league.html:17
 msgid "No edits have yet been made."
@@ -1960,7 +1958,7 @@ msgstr "Jo Pergjegjes"
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:13
 msgid "Not contactable"
-msgstr ""
+msgstr "E pa kontaktueshme"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:104
 msgid "Not for my subdivision"
@@ -1972,7 +1970,7 @@ msgstr "Nuk eshte raportuar me pare"
 
 #: templates/web/base/report/_main_sent_info.html:4
 msgid "Not reported to council"
-msgstr ""
+msgstr "E pa raportuar tek council"
 
 #: templates/web/base/admin/body.html:75
 #: templates/web/base/admin/category_edit.html:57
@@ -2029,7 +2027,7 @@ msgstr "Probleme <br> te vjetra"
 
 #: templates/web/base/reports/_list-filters.html:36
 msgid "Oldest"
-msgstr ""
+msgstr "Më i vjetri"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
@@ -2047,11 +2045,11 @@ msgstr "Hapur"
 
 #: templates/web/base/reports/index.html:25
 msgid "Open for more than four weeks, with an update within the past eight weeks"
-msgstr ""
+msgstr "E hapur për më shumë se 4 javë, me një përditësim në 8 javët e fundit"
 
 #: templates/web/base/reports/index.html:26
 msgid "Open, but not had any update in eight weeks"
-msgstr ""
+msgstr "E hapur, por nuk ka pasur ndonjë përditësim në 8 javë"
 
 #: templates/web/base/admin/open311-form-fields.html:47
 msgid "Open311 API Key"
@@ -2063,15 +2061,15 @@ msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:34
 msgid "Open311 Jurisdiction"
-msgstr ""
+msgstr "Open311 Juridiksioni"
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
-msgstr ""
+msgstr "Open311 web faqën inicuese"
 
 #: templates/web/base/open311/index.html:73
 msgid "Open311 specification"
-msgstr ""
+msgstr "Specifikat e Open311"
 
 #: templates/web/base/alert/_list.html:61
 msgid "Or problems reported to:"
@@ -2130,7 +2128,7 @@ msgstr ""
 
 #: templates/web/base/admin/user-form.html:152
 msgid "Permissions:"
-msgstr ""
+msgstr "Lejet"
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:65
 msgid "Phone number"
@@ -2169,19 +2167,18 @@ msgstr "Fotografia"
 
 #: perllib/FixMyStreet/App/Controller/Photo.pm:186
 msgid "Photo is required."
-msgstr ""
+msgstr "Fotografia është e kërkueshme."
 
 #: templates/web/zurich/admin/contact-form.html:14
 msgid "Photo required"
-msgstr ""
+msgstr "Kërkohet fotografi."
 
 #: templates/web/base/questionnaire/index.html:78
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Fotografia"
+msgstr "Foto"
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2232,13 +2229,12 @@ msgstr "Ju lutem zgjedhni kategorine"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:446
 msgid "Please choose a property type"
-msgstr ""
+msgstr "Ju lutem zgjedhni tipin e pronës"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
-msgstr ""
+msgstr "Ju lutem përmirësoni gabimet e mëposhtme"
 
 #: templates/web/base/contact/blurb.html:12
 msgid ""
@@ -2260,12 +2256,11 @@ msgstr "Ju lutem shkruaj nje mesazh"
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 msgid "Please enter a name"
-msgstr ""
+msgstr "Ju lutem shkruani emrin"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Ju lutem shkruaj fjalekalimin"
+msgstr "Ju lutem jepni një emër për këtë drejtori"
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2291,7 +2286,7 @@ msgstr "Ju lutem shkruaj nje email valid"
 #: perllib/FixMyStreet/App/Controller/Alert.pm:350
 #: perllib/FixMyStreet/App/Controller/Contact.pm:124
 msgid "Please enter a valid email address"
-msgstr ""
+msgstr "Ju lutem shkruani një email adresë valide"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:426
 #: templates/web/base/js/translation_strings.html:4
@@ -2323,7 +2318,7 @@ msgstr "Ju lutem shkruani emrin tuaj"
 #: perllib/FixMyStreet/Cobrand/UK.pm:319
 #: templates/web/base/js/translation_strings.html:7
 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 ""
+msgstr "Ju lutem shkruani emrin tuaj të plotë, council i cili kërkon këtë informatë - nëse nuk doni që emri juaj të shihet në faqe, largoni etiketimin nga kutia e mëposhtme"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:123
@@ -2357,29 +2352,29 @@ msgstr "Ju lutem pershkruani ne hollesi problemin me poshte."
 
 #: templates/web/zurich/report/new/fill_in_details_form.html:49
 msgid "Please fill in details of the problem."
-msgstr ""
+msgstr "Ju lutem të plotësoni në detaje problemin"
 
 #: 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 ""
+msgstr "Ju lutem plotësoni formën e mëposhtme me detajet e problemit dhe përshkruani lokacionin sa më saktë që është e mundur në kutinë e detajeve."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
 msgid "Please indicate whether you'd like to receive another questionnaire"
-msgstr ""
+msgstr "Ju lutem tregoni nëse ju do dëshironit të merrni një pyetsor tjetër"
 
 #: templates/web/base/report/updates-sidebar-notes.html:2
 msgid "Please note that updates are not sent to the council."
-msgstr ""
+msgstr "Ju lutem keni parasysh që përditësimet nuk dërgohen në council"
 
 #: templates/web/base/report/new/oauth_email_form.html:4
 msgid "Please note your report has <strong>not yet been sent</strong>."
-msgstr ""
+msgstr "Ju lutem keni parasysh që raporti juaj nuk është dërguar."
 
 #: templates/web/base/report/new/fill_in_details_form.html:12
 #: 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 ""
+msgstr "Keni parasysh që raporti juaj nuk është dërguar. Zgjedhni një kategori që të shtoni më shumë të dhëna më poshtë, pastaj dërgoni."
 
 #: templates/web/base/report/display.html:34
 msgid "Please note your update has <strong>not yet been posted</strong>."
@@ -2391,13 +2386,12 @@ msgid "Please note:"
 msgstr "Ju lutem vini re:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Ju lutem shkruani perditesimin tuaj ketu"
+msgstr "Ju lutem sigorni një përditësim publik për këtë raport"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
-msgstr ""
+msgstr "Ju lutem na siguroni më shumë shpjegime se pse po ri-hapni këtë raport"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
 msgid "Please provide some text as well as a photo"
@@ -2406,11 +2400,11 @@ msgstr "Ju lutem ofroni nje pershkrim si dhe nje fotografi"
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
 msgid "Please say whether you've ever reported a problem to your council before"
-msgstr ""
+msgstr "Ju lutem na tregoni nëse keni raportuar ndonjë problem tek council i juaj më parë."
 
 #: templates/web/zurich/admin/report_edit.html:204
 msgid "Please select a body."
-msgstr ""
+msgstr "Ju lutem zgjedhni një drejtori"
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:83
 msgid "Please select the feed you want"
@@ -2422,14 +2416,14 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
 msgid "Please state whether or not the problem has been fixed"
-msgstr ""
+msgstr "Ju lutem tregoni nëse problemi është zgjedhur apo jo "
 
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
 #: templates/web/base/js/translation_strings.html:54
 msgid "Please upload an image only"
-msgstr ""
+msgstr "Ju lutem ngarkoni vetëm një fotografi"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:115
 msgid "Please write a message"
@@ -2468,21 +2462,21 @@ msgstr "Paraprak"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:665
 msgid "Priorities"
-msgstr ""
+msgstr "Prioritetet"
 
 #: templates/web/base/report/_inspect.html:87
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #: templates/web/base/footer.html:38
 msgid "Privacy"
-msgstr ""
+msgstr "Privatësi"
 
 #: 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 ""
+msgstr "Privatësia dhe cookiesa"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
@@ -2504,13 +2498,13 @@ msgstr "Problemi %s u konfirmua"
 
 #: templates/web/base/admin/timeline.html:26
 msgid "Problem %s sent to council %s"
-msgstr ""
+msgstr "Problemi %s është dërguar tek council %s"
 
 #: templates/web/base/admin/stats.html:57
 #: templates/web/base/admin/stats_by_state.html:12
 #: templates/web/zurich/admin/index.html:9
 msgid "Problem breakdown by state"
-msgstr ""
+msgstr "Nën-ndarja me shtete"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1171
 msgid "Problem marked as open."
@@ -2555,7 +2549,7 @@ msgstr "Problemet brenda lagjes %s"
 #: templates/web/base/reports/body.html:0
 #: templates/web/base/reports/body.html:25
 msgid "Problems within %s, %s"
-msgstr ""
+msgstr "Problemi përbrenda %s, %s"
 
 #: templates/web/base/alert/_list.html:43
 msgid "Problems within the boundary of:"
@@ -2570,18 +2564,17 @@ msgid "Provide an update"
 msgstr "Ofro nje perditesim"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Ofro nje perditesim"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
-msgstr ""
+msgstr "Dhënia e emrit dhe fjalëkalimit janë opcionale, por nëse jepni këto të dhëna do të lehtësoj raportimin e problemeve, përditsimin dhe menaxhimin e raporteve tuaja."
 
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:9
 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 "Dhënia e fjalëkalimit është opcional, por duke dhënë atë do të ju lejohet që më lehtë të raportoni problemin, bëni përditësim dhe menaxhoni raportet tuaja."
 
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
@@ -2589,9 +2582,8 @@ msgid "Public response:"
 msgstr "Pergjigje publike:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Pergjigje publike:"
+msgstr "Përditësim publik."
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2607,15 +2599,15 @@ msgstr "Pyetesor"
 
 #: templates/web/base/admin/timeline.html:30
 msgid "Questionnaire %d answered for problem %d, %s to %s"
-msgstr ""
+msgstr "Pyetsorë %d përgjigjur për probleme "
 
 #: templates/web/base/admin/timeline.html:28
 msgid "Questionnaire %d sent for problem %d"
-msgstr ""
+msgstr "Pyetsorë dërguar për problem"
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
 msgid "Questionnaire filled in by problem reporter"
-msgstr ""
+msgstr "Pyestor i plotësuar nga raportuesi i problemit"
 
 #: templates/web/base/alert/_list.html:23
 #: templates/web/base/alert/updates.html:9
@@ -2676,13 +2668,13 @@ msgstr "Prano email kur ka perditesime te ketij problemi"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:720
 msgid "Received by %s moments later"
-msgstr ""
+msgstr "Pranuar nga  momente më vonë"
 
 #. ("%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 ""
+msgstr "Problemet lokale së fundmi"
 
 #: templates/web/base/reports/index.html:27
 msgid "Recently <br>fixed"
@@ -2690,16 +2682,15 @@ msgstr "Rregullimet <br> e fundit"
 
 #: templates/web/base/front/recent.html:11
 msgid "Recently reported problems"
-msgstr ""
+msgstr "Problemet e raportuara së fundmi"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Merr perditesimet"
+msgstr "Përditësuar së fundmi"
 
 #: 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 ""
+msgstr "Mbani në mend që FixMyStreet është për të raportuar problemet fizike primare që mund të rregullohen. Nëse problemi juaj nuk është i përshtashëm  tu dërguar përmes kësaj faqe mbani në mend që mund të kontaktoni përmes council tuaj direkt duke përdorur councin e tyre."
 
 #: templates/web/base/admin/report_blocks.html:46
 msgid "Remove flag"
@@ -2709,11 +2700,11 @@ msgstr "Largo flamurin"
 #: templates/web/base/report/_main.html:18
 #: templates/web/base/report/_main.html:24
 msgid "Remove from shortlist"
-msgstr ""
+msgstr "Fshije nga lista e ngushtë"
 
 #: templates/web/base/report/display_tools.html:6
 msgid "Remove from site"
-msgstr ""
+msgstr "Fshije nga website"
 
 #: templates/web/base/admin/report_edit.html:172
 #: templates/web/base/admin/update_edit.html:69
@@ -2723,16 +2714,15 @@ msgstr "Largo fotografine (nuk mund te kthehet!)"
 
 #: templates/web/zurich/admin/report_edit.html:239
 msgid "Reply to user:"
-msgstr ""
+msgstr "Përgjigju përdoruesit:"
 
 #: templates/web/base/header_logo.html:2
 msgid "Report"
-msgstr ""
+msgstr "Raporto"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Raportimet"
+msgstr "ID e raportit:"
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2745,9 +2735,8 @@ msgid "Report abuse"
 msgstr "Raporto abuzimin"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Raportimet"
+msgstr "Raporto si"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2757,12 +2746,12 @@ msgstr "Raporto ne %s"
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
 msgid "Report your problem"
-msgstr ""
+msgstr "Raportoni problemin tuaj"
 
 #: templates/web/base/around/intro.html:1
 #: templates/web/zurich/around/intro.html:1
 msgid "Report, view, or discuss local problems"
-msgstr ""
+msgstr "Raporto,shiqo apo diskuto problemet lokale"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:605
 #: templates/web/base/contact/index.html:57
@@ -2772,7 +2761,7 @@ msgstr "Raportuar ne menyre anonime te %s"
 #: templates/web/base/admin/questionnaire.html:5
 #: templates/web/base/questionnaire/index.html:64
 msgid "Reported before"
-msgstr ""
+msgstr "Të raportuara më parë"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:621
 #: templates/web/base/contact/index.html:59
@@ -2782,7 +2771,7 @@ msgstr "Raportuar nga %s ne %s"
 #: templates/web/zurich/admin/report_edit-sdm.html:60
 #: templates/web/zurich/admin/report_edit.html:88
 msgid "Reported by:"
-msgstr ""
+msgstr "Raportuar nga:"
 
 #: templates/web/zurich/report/_main.html:2
 msgid "Reported in the %s category"
@@ -2814,12 +2803,12 @@ msgstr "Raportuar nepermjet %s ne kategorine %s ne %s"
 
 #: templates/web/base/reports/index.html:24
 msgid "Reported within the last four weeks"
-msgstr ""
+msgstr "Raportuar në katër javët e fundit"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:38
 #: templates/web/zurich/admin/report_edit.html:57
 msgid "Reported:"
-msgstr ""
+msgstr "Raportuar:"
 
 #: templates/web/base/around/index.html:2
 #: templates/web/base/around/lookup_by_ref.html:2
@@ -2842,15 +2831,15 @@ msgstr "Raportimet jane te kufizuara ne gjatesine %s karaktere. Ju lutem shkurto
 
 #: templates/web/zurich/admin/index-sdm.html:7
 msgid "Reports awaiting approval"
-msgstr ""
+msgstr "Raporti është duke pritur për aprovim"
 
 #: templates/web/base/admin/user-form.html:127
 msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
+msgstr "Raportet nga përdoruesit me reputacion të lartë dhe të mjaftueshëm do të dërgohen menjëherë pa kërkuar inspektimin e mëtutjeshëm. Pragu i çdo kategorie mund të menaxhohet në faqen e saj të redaktimit. Përdoruesit fitojnë reputacion kur një raport që kanë bërë është shënuar si i kontrolluar nga inspektorët."
 
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
-msgstr ""
+msgstr "Raportet e bëra nga përdoruesit e besueshëm do të dërgohen tek drejtoria përgjegjëse pa u kontrolluar më parë."
 
 #: templates/web/zurich/admin/index-sdm.html:10
 msgid "Reports published"
@@ -2858,11 +2847,11 @@ msgstr "Raporti u publikua"
 
 #: templates/web/base/admin/index.html:50
 msgid "Reports waiting to be sent"
-msgstr ""
+msgstr "Raportet duke pritur për tu dërguar"
 
 #: templates/web/base/admin/contact-form.html:89
 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 ""
+msgstr "Raportet automatikisht do të dërgohen pa nevojë për tu kontrolluar nëse <strong> reputacioni i përdoruesit </ strong> është në ose mbi këtë vlerë. Vendosni <strong> 0 </ strong> në qoftë se të gjitha raportet duhet të kontrollhohen pa dallim."
 
 #: templates/web/base/admin/contact-form.html:94
 msgid "Reputation threshold"
@@ -2870,7 +2859,7 @@ msgstr ""
 
 #: templates/web/base/admin/user-form.html:130
 msgid "Reputation:"
-msgstr ""
+msgstr "Reputacioni:"
 
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
@@ -2878,30 +2867,30 @@ msgstr "Ridergo raportin"
 
 #: templates/web/base/admin/responsepriorities/index.html:1
 msgid "Response Priorities"
-msgstr ""
+msgstr "Prioritetet e përgjigjeve"
 
 #: templates/web/base/admin/responsepriorities/list.html:1
 msgid "Response Priorities for %s"
-msgstr ""
+msgstr "Prioritetet e përgjigjeve për %s"
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
 msgid "Response Priority for %s"
-msgstr ""
+msgstr "Prioriteti i përgjigjes për %s"
 
 #: templates/web/base/admin/template_edit.html:1
 msgid "Response Template for %s"
-msgstr ""
+msgstr "Shablloni i përgjigjes për %s"
 
 #: templates/web/base/admin/templates_index.html:1
 msgid "Response Templates"
-msgstr ""
+msgstr "Shabllonet e përgjigjeve"
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
 #: templates/web/zurich/admin/template_edit.html:1
 #: templates/web/zurich/admin/template_edit.html:4
 msgid "Response Templates for %s"
-msgstr ""
+msgstr "Shabllone të përgjigjjeve për"
 
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
@@ -2911,12 +2900,12 @@ msgstr "Vendi i duhur?"
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167
 #: perllib/FixMyStreet/Geocode/OSM.pm:152
 msgid "Road operator for this named road (derived from road reference number and type): %s"
-msgstr ""
+msgstr "Operatori i rrugës për emrin e kësaj rruge  (rrjedh nga numri i references dhe lloji i rrugës)"
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164
 #: perllib/FixMyStreet/Geocode/OSM.pm:149
 msgid "Road operator for this named road (from OpenStreetMap): %s"
-msgstr ""
+msgstr "Operatori i rrugës për emrin e kësaj rruge (nga OpenStreetMap)."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1724
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1728
@@ -2935,12 +2924,12 @@ msgstr "Rrotullo Djathtas"
 
 #: templates/web/zurich/admin/report_edit.html:110
 msgid "Rotating this photo will discard unsaved changes to the report."
-msgstr ""
+msgstr "Rrotullimi i kësaj foto do të heq dorë nga ndryshimet e paruajtura në raport."
 
 #: templates/web/base/js/translation_strings.html:47
 #: templates/web/base/maps/google-ol.html:9
 msgid "Satellite"
-msgstr ""
+msgstr "Satelitore"
 
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
@@ -2954,16 +2943,15 @@ msgstr "Ruaj ndryshimet"
 
 #: templates/web/base/report/_inspect.html:121
 msgid "Save with a public update"
-msgstr ""
+msgstr "Ruaje me një përditësim për publikun"
 
 #: templates/web/base/admin/index.html:24
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
-msgstr "Kerko Raportet"
+msgstr "Kërko Raportet"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Kerko Perdoruesit"
 
@@ -2988,16 +2976,16 @@ msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues."
 #: templates/web/base/report/new/councils_text_private.html:7
 #: templates/web/base/report/new/form_user.html:5
 msgid "See our privacy policy"
-msgstr ""
+msgstr "Shiqo rregulloren tonë të privatësisë"
 
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
-msgstr ""
+msgstr "Zgjedh një drejtori"
 
 #: templates/web/base/reports/index.html:12
 msgid "Select a particular council to see the reports sent there."
-msgstr ""
+msgstr "Zgjedh një Komunë të caktuar për të parë raportet e dërguara atje."
 
 #: templates/web/base/admin/body-form.html:77
 #: templates/web/zurich/admin/body-form.html:26
@@ -3006,12 +2994,11 @@ msgstr "Zgjedh nje zone"
 
 #: templates/web/base/alert/_list.html:11
 msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
-msgstr ""
+msgstr "Zgjidhni llojin e njoftimit që ju dëshironi dhe klikoni në butonin për një RSS, ose shkruani adresën tuaj të e-mail për tu abonuar në një njoftim me email."
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Tema:"
+msgstr "Selekto:"
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3019,45 +3006,44 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:826
 msgid "Sent report back"
-msgstr ""
+msgstr "Dërgo raportin prapa"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:724
 msgid "Sent to %s %s later"
-msgstr ""
+msgstr "Dërgo tek %s %s më vonë"
 
 #: templates/web/base/admin/report_edit.html:79
 msgid "Sent:"
-msgstr "Dergo:"
+msgstr "Dërgo:"
 
 #: templates/web/base/admin/report_edit.html:90
 #: templates/web/zurich/admin/stats.html:45
 msgid "Service:"
-msgstr "Sherbim:"
+msgstr "Shërbim:"
 
 #: templates/web/base/report/_inspect.html:26
 msgid "Set to my current location"
-msgstr ""
+msgstr "Vendos tek lokacioni im i tanishëm"
 
 #: templates/web/base/report/display_tools.html:15
 msgid "Share"
-msgstr "Shperndaj"
+msgstr "Shpërndajë"
 
 #: templates/web/base/report/_main.html:132
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:26
 msgid "Shortlist"
-msgstr ""
+msgstr "Lista e ngushtë"
 
 #: templates/web/base/report/_main.html:130
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:23
 msgid "Shortlisted"
-msgstr ""
+msgstr "Përzgjedhur"
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Postuar nga %s ne %s"
+msgstr "Përzgjedhur nga %s"
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3083,7 +3069,7 @@ msgstr "Kyqu"
 
 #: templates/web/base/auth/general.html:96
 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 "Kyçuni me email, duke siguruar fjalëkarim të ri. Kur klinoni në linkun në emailin tuaj, fjalëkalimi juaj do të përditësohet."
 
 #: templates/web/base/auth/general.html:1
 #: templates/web/zurich/auth/general.html:1
@@ -3108,24 +3094,24 @@ msgstr ""
 
 #: templates/web/base/alert/index.html:40
 msgid "Some photos of recent reports"
-msgstr ""
+msgstr "Disa foto nga raportet më të fundit"
 
 #. ('Optional comment for translator')
 #: perllib/FixMyStreet/Template.pm:53
 msgid "Some text to localize"
-msgstr ""
+msgstr "Teksti për të lokalizuar"
 
 #: perllib/FixMyStreet/Cobrand/UK.pm:79
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
-msgstr ""
+msgstr "Na falni, ky  duhet të jetë Crown kod postar i pavarur, të cilin ne nuk e mbulojmë."
 
 #: templates/web/base/auth/token.html:8
 msgid "Sorry, that wasn&rsquo;t a valid link"
-msgstr ""
+msgstr "Na vjen keq, ai nuk ishte link valid"
 
 #: templates/web/base/tokens/abuse.html:5
 msgid "Sorry, there has been an error confirming your problem."
-msgstr ""
+msgstr "Na vjen keq, është nje problem me konfirmimin e raportit tuaj."
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:222
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
@@ -3138,7 +3124,7 @@ msgstr "Na vjen keq, ne nuk mund te gjejme kete lokacion."
 #: templates/web/base/report/display.html:29
 #: templates/web/base/report/new/fill_in_details_form.html:15
 msgid "Sorry, we could not log you in. Please fill in the form below."
-msgstr ""
+msgstr "Na vjen keq, ne nuk mund të hyni. Ju lutemi plotësoni formularin e mëposhtëm."
 
 #: perllib/FixMyStreet/Geocode/Bing.pm:35
 #: perllib/FixMyStreet/Geocode/Google.pm:45
@@ -3148,23 +3134,23 @@ msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni per
 
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
 msgid "Sorry, we couldn't save your image(s), please try again."
-msgstr ""
+msgstr "Na vjen keq, ne nuk mund të ruajmë imazhin(et) tuaj, ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
-msgstr ""
+msgstr "Na vjen keq, ju nuk keni leje për të bërë atë."
 
 #: templates/web/base/reports/_list-filters.html:33
 msgid "Sort by"
-msgstr ""
+msgstr "Ndaj sipas"
 
 #: templates/web/base/admin/user-form.html:47
 msgid "Staff users have permission to log in to the admin."
-msgstr ""
+msgstr "Përdoruesit e stafit kanë leje për të hyrë brënda tek admin."
 
 #: templates/web/base/admin/user-form.html:50
 msgid "Staff:"
-msgstr ""
+msgstr "Stafi:"
 
 #: templates/web/base/admin/stats.html:71
 msgid "Start Date:"
@@ -3191,8 +3177,7 @@ msgstr "Gjendje:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3211,7 +3196,7 @@ msgstr "Akoma hapur, nepermjet pyetesorit, %s"
 #: templates/web/zurich/admin/report_edit-sdm.html:27
 #: templates/web/zurich/admin/report_edit.html:28
 msgid "Street View"
-msgstr ""
+msgstr "Pamje e rrugës"
 
 #: perllib/FixMyStreet/Script/Reports.pm:194
 msgid "Subcategory: %s"
@@ -3219,7 +3204,7 @@ msgstr "Nenkategoria: %s"
 
 #: templates/web/zurich/admin/index-dm.html:27
 msgid "Subdivision/Body"
-msgstr ""
+msgstr "Nëndivizioni/Drejtoria"
 
 #: templates/web/base/contact/index.html:90
 msgid "Subject"
@@ -3236,7 +3221,7 @@ msgstr "Tema:"
 #: templates/web/base/report/new/form_user_loggedout_password.html:11
 #: templates/web/zurich/report/new/fill_in_details_form.html:73
 msgid "Submit"
-msgstr "Paraqit"
+msgstr "Dërgo"
 
 #: templates/web/base/admin/report_edit.html:180
 #: templates/web/base/admin/report_edit.html:24
@@ -3270,23 +3255,20 @@ msgstr "Abonohu"
 
 #: templates/web/base/alert/_list.html:93
 msgid "Subscribe me to an email alert"
-msgstr ""
+msgstr "Më abono tek njoftimi me e-mail"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Pershkruaje problemin"
+msgstr "Përmbledhni problemin"
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Paraqit ndryshimet"
+msgstr "Përmbledhni ndryshimet tuaja"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3303,11 +3285,11 @@ msgstr "Raportet përmbledhëse"
 
 #: templates/web/base/admin/user-form.html:141
 msgid "Superuser:"
-msgstr ""
+msgstr "Superpërdorues:"
 
 #: templates/web/base/admin/user-form.html:138
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
-msgstr ""
+msgstr "Superpërdorues keni leje për të kryer <strong> të gjitha veprimet </ strong> brenda adminit."
 
 #: templates/web/base/admin/questionnaire.html:1
 #: templates/web/base/admin/stats.html:56
@@ -3316,13 +3298,13 @@ msgstr "Rezultatet e Studimit"
 
 #: templates/web/zurich/admin/template_edit.html:7
 msgid "Template &laquo;%s&raquo;"
-msgstr ""
+msgstr "Shabllon &laquo;%s&raquo "
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:661
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:393
 #: templates/web/zurich/header.html:69
 msgid "Templates"
-msgstr ""
+msgstr "Shabllonet"
 
 #: templates/web/base/admin/list_updates.html:12
 #: templates/web/base/admin/templates.html:11
@@ -3342,57 +3324,57 @@ msgstr "Tekst:"
 
 #: templates/web/base/tokens/confirm_problem.html:25
 msgid "Thank you for reporting this issue!"
-msgstr ""
+msgstr "Ju faleminderit për raportimin e këtij problemi!"
 
 #: 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 ""
+msgstr "Faleminderit për  përpjekjet tuaja për të konfirmuar përditësimin tuaj rreth problemit. Ne duket se kemi vetë një gabim,kështu që na <a href=\"%s\">  tregoni se qka ndodhi </a> dhe ne do të shikojmë  atë problem."
 
 #: templates/web/base/tokens/confirm_update.html:15
 msgid "Thank you for updating this issue!"
-msgstr ""
+msgstr "Faleminderit për përditësimin e këtij problemi."
 
 #: templates/web/base/contact/submit.html:6
 msgid "Thank you for your enquiry"
-msgstr ""
+msgstr "Faleminderit për kërkesën tuaj"
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
-msgstr ""
+msgstr "Faleminderit për komentin tuaj"
 
 #: templates/web/base/around/_error_multiple.html:17
 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 "Faleminderit që ngarkuat fotografinë tuaj. Tani duhet  të lokalizojmë problemin tuaj, andaj ju lutem të jepni emrin e rrugës apo kodit postar më të afërt në kutinë më lartë."
 
 #: 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 "Faleminderit, është knaqësi të dëgjojmë që është rregulluar. A mund të dimë nëse keni raportuar ndonjë problem në ndonjë drejtori më herët?"
 
 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
-msgstr ""
+msgstr "Duket se imazhi nuk është ngarkuar si duhet (%s), ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/App/Controller/Council.pm:102
 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 "Ai vend nuk duket të jetë i mbuluar nga një drejtori; ndoshta kjo është në det të hapur ose jashtë vendit. Ju lutemi provoni përsëri."
 
 #: perllib/FixMyStreet/App/Controller/Location.pm:129
 msgid "That location does not appear to be in the UK; please try again."
-msgstr ""
+msgstr "Ai vend nuk duket të jetë në Kosovë; ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
 #: perllib/FixMyStreet/Cobrand/UK.pm:72
 msgid "That postcode was not recognised, sorry."
-msgstr ""
+msgstr "Kodi postar nuk u njoh, na vjeqn keq."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:762
 msgid "That problem has been marked as sent."
-msgstr ""
+msgstr "Ky problem ka qenë i shënuar si i dërguar."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:755
 msgid "That problem will now be resent."
-msgstr ""
+msgstr "Ai problem tash do të ri-dërgohet."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:137
 msgid "That report cannot be viewed on %s."
@@ -3400,13 +3382,15 @@ msgstr "Raporti nuk mund te shihet ne %s."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:131
 msgid "That report has been removed from FixMyStreet."
-msgstr ""
+msgstr "Ai raport është fshirë nga FixMyStreet."
 
 #: templates/web/base/admin/contact-form.html:25
 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 ""
+"<Strong> E-mail adresa </ strong> është destinacioni për të cilin raporti për këtë kategori do të dërgohet.\n"
+"Kategori të tjera për këtë Drejtori mund të kenë të njëjtën adresë e-maili."
 
 #: templates/web/base/admin/open311-form-fields.html:14
 #: templates/web/base/admin/open311-form-fields.html:15
@@ -3414,6 +3398,8 @@ msgid ""
 "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
 "            when sending reports to this body."
 msgstr ""
+"<Strong> Pika e fundit</ strong> është URL e shërbimit që FixMyStreet do të lidhë \n"
+"kur bën dërgimin e raporteve drejtë kësaj Drejtorie."
 
 #: templates/web/base/admin/open311-form-fields.html:27
 #: templates/web/base/admin/open311-form-fields.html:28
@@ -3430,6 +3416,8 @@ 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 ""
+"<Strong>Metoda e dërgimit</ strong> përcakton se si raportet rreth problemit do të dërgohen në Drejtorinë përkatëse.\n"
+"Nëse ju e lëni këtë bosh, <strong> metoda e dërgimit do të jetë në email </ 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."
@@ -3441,11 +3429,13 @@ msgid ""
 "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
 "          and may be displayed publically."
 msgstr ""
+"<Strong> Emri i drejtorisë</ strong> identifikon drejtorinë (për shembull, <em> Drejtoria e Shërbimeve Publike </ em>)\n"
+"dhe mund të shfaqet publikisht."
 
 #: templates/web/base/report/new/fill_in_details_text.html:1
 #: 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 ""
+msgstr "Drejtoria nuk do të jetë në gjendje të ndihmojë veç nëse ju lëni sa më shumë detaje. Ju lutem, përshkruani vendndodhjen e saktë të problemit (p.sh. në një mur), ajo që është, sa kohë ka ajo ka qenë atje, një përshkrim (dhe një foto e problemit, nëse ju keni një të tillë), etj"
 
 #: templates/web/base/admin/edit-league.html:3
 #: templates/web/base/admin/edit-league.html:4
@@ -3464,7 +3454,7 @@ msgstr ""
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159
 #: perllib/FixMyStreet/Geocode/OSM.pm:144
 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 ""
+msgstr "Informacioni i mëposhtëm në lidhje me rrugën më të afërt mund të jenë të pasakta apo të parëndësishme, nëse problemi është i afërt me disa rrugëve ose në afërsi të një rruge pa një emër të regjistruar në OpenStreetMap."
 
 #: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
 #: db/alert_types.pl:31
@@ -3477,7 +3467,7 @@ msgstr "Problemet e fundit per {{COUNCIL}}  te raportuara nga perdoruesit"
 
 #: db/alert_types.pl:39
 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
-msgstr ""
+msgstr "Problemet e fundit për {{COUNCIL}} brenda {{WARD}} lagjen të raportuara nga përdoruesit"
 
 #: db/alert_types.pl:11
 msgid "The latest problems reported by users"
@@ -3489,15 +3479,15 @@ msgstr "Problemet e fundit te raportuara si te rregulluara nga perdoruesit"
 
 #: db/alert_types.pl:43
 msgid "The latest problems within {{NAME}}'s boundary reported by users"
-msgstr ""
+msgstr "Problemet e fundit brenda {{NAME}} kufirit të raportuara nga përdoruesit"
 
 #: 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 "Linku mund të ketë skaduar, ose ndoshta ju nuk mundet ta kopjoni atë të saktë."
 
 #: templates/web/base/admin/body-form.html:64
 msgid "The list of available areas is being provided by the MapIt service at %s."
-msgstr ""
+msgstr "Lista e zonave në dispozicion është duke u siguruar nga shërbimi MapIt në %s."
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:26
@@ -3510,11 +3500,11 @@ msgstr "URL e kerkuar '%s' nuk u gjet ne kete server"
 
 #: templates/web/base/alert/_list.html:17
 msgid "The simplest alert is our geographic one:"
-msgstr ""
+msgstr "Njoftimi më i thjeshtë është ai gjeografik:"
 
 #: perllib/FixMyStreet/Script/Reports.pm:96
 msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
-msgstr ""
+msgstr "Përdoruesi nuk mund të lokalizojnë problemin në hartë, por ata mund të shohin zonën përreth lokacionit të cilin kanë dhënë"
 
 #: templates/web/base/admin/user-form.html:10
 #: templates/web/base/admin/user-form.html:11
@@ -3522,44 +3512,46 @@ 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 ""
+"<Strong> Emri i përdoruesit </ strong> është shfaqur publikisht në raportet që nuk janë shënuar <em> si anonim </ em> .\n"
+"Emrat nuk janë domosdoshmërisht unike."
 
 #: templates/web/base/around/on_map_list_items.html:12
 #: templates/web/base/my/_problem-list.html:8
 #: templates/web/base/reports/_problem-list.html:13
 msgid "There are no reports to show."
-msgstr ""
+msgstr "Nuk ka raporte për të shfaqur"
 
 #: perllib/FixMyStreet/App/Controller/Reports.pm:79
 msgid "There was a problem showing the All Reports page. Please try again later."
-msgstr ""
+msgstr "Ka problem në hapjën e faqes Të gjitha raportet. Ju lutem provoni përsëri më vonë."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:137
 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
 msgid "There was a problem showing this page. Please try again later."
-msgstr ""
+msgstr "Ka probleme në hapjën e kësaj faqe. Ju lutem provoni përsëri më vonë."
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:751
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
-msgstr ""
+msgstr "Ka një problem në kombinimin e email/fjalëkalimit tuaj. Nëse nuk mund të kujtoni fjalëkalimin tuaj, ose nuk keni një, ju lutem plotësoni &isquo, dhe nënshkruani me email&rqsuo, seksionin në formë."
 
 #: perllib/FixMyStreet/App/Controller/Alert.pm:359
 msgid "There was a problem with your email/password combination. Please try again."
-msgstr ""
+msgstr "Ka një problem me kombinimin e emailit/fjalëkalimit tuaj. Ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:357
 msgid "There was a problem with your update. Please try again."
-msgstr ""
+msgstr "Ka një problem me përditësimin tuaj. Ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:141
 msgid "There were problems with your report. Please see below."
-msgstr ""
+msgstr "Ka disa probleme me raportin tuaj. Ju lutem shihni më poshtë."
 
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:392
 msgid "There were problems with your update. Please see below."
-msgstr ""
+msgstr "Ka pasur probleme me përditësimin tuaj. Ju lutemi shihni më poshtë."
 
 #: templates/web/base/admin/open311-form-fields.html:3
 #: templates/web/base/admin/open311-form-fields.html:4
@@ -3569,30 +3561,30 @@ msgid ""
 "           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 ""
+msgstr "Këto opcione janë drejtori që përdoren nga Open311 për të pranuar problemet e raportuara. Ju nuk keni nevoj  të zgjedhni nëse Send Method është email. Për më shumë informata për Open 311 shihni  këtë artikull "
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr ""
+msgstr "Këto do të publikohen në internet për të tjerët për të parë, në përputhje me <a href=\"%s\"> </a> Politikat tona të privatësisë."
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
 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 "Këto do të dërgohen në <strong> %s </ strong> dhe do të publikohen edhe në internet për të tjerët për ti parë, në përputhje me <a href=\"%s\"> </a> politikat tona Politika e privatësisë."
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
 msgid "These will be sent to the council, but will never be shown online."
-msgstr ""
+msgstr "Këto do të dërgohet në Drejtori, por kurrë nuk do të shfaqet në internet për publikun."
 
 #: templates/web/base/report/new/councils_text_private.html:3
 msgid "These will never be shown online."
-msgstr ""
+msgstr "Këto nuk do të shfaqen në internet."
 
 #: 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 "Ky implementim i API është punë në progres dhe nuk është stabilizuar ende. Do të ndryshojë pa ndonjë paralajmërim në të ardhmen e afërt."
 
 #: templates/web/base/admin/body.html:48
 msgid ""
@@ -3600,10 +3592,13 @@ 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 ""
+"Kjo Drejtori nuk mbulon asnjë zonë. Kjo do të thotë se nuk ka juridiksion mbi problemet e  raportuara <em> në çdo vend </ em> .\n"
+"Rrjedhimisht, asnjë nga kategoritë e saj nuk do të shfaqen në  drop-down, kur përdoruesit e raportojnë problemin.\n"
+"Aktualisht, përdoruesit <strong> nuk mund të raportojnë probleme drejtë kësaj Drejtorie </ strong>."
 
 #: templates/web/base/admin/body.html:58
 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
-msgstr ""
+msgstr "Kjo Drejtori nuk ka kontakte. Kjo do të thotë se aktualisht problemet e raportuara drejtë kësaj drejtorie <strong> nuk do të dërgohen </ strong>."
 
 #: templates/web/base/admin/body-form.html:58
 #: templates/web/base/admin/body-form.html:59
@@ -3611,33 +3606,35 @@ 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 ""
+"Kjo Drejtori do të pranojë vetëm raporte për probleme që janë të vendosura në <strong> zonën e mbuluar </ strong> .\n"
+"Një drejtori nuk do të marrë ndonjë raport vetëm  nëse ajo mbulon të paktën një zonë atëherë do të pranojë një raport."
 
 #: perllib/FixMyStreet/Script/Reports.pm:201
 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 ""
+msgstr "Ky email është dërguar të dy Drejtorite që mbulojnë vendndodhjen e problemit, pasi përdoruesi nuk e kategorizoj atë; ju lutemi të injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje, ose na tregoni se çfarë kategorie e problemit është kjo kështu që ne mund të shtojmë atë në sistemin tonë."
 
 #: perllib/FixMyStreet/Script/Reports.pm:204
 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 ""
+msgstr "Ky email është dërguar në disa Drejtori që mbulojnë vendndodhjen e problemit, pasi që kategoria e zgjedhur është dhënë për të gjithë ata; ju lutemi ta injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje."
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:874
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:918
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:964
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
-msgstr ""
+msgstr "Ky informacion është i nevojshëm"
 
 #: templates/web/base/debug_header.html:3
 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
-msgstr ""
+msgstr "Kjo është web faqe e zhvilluesve; gjëra mund të thyhen në çdo kohë, dhe baza e të dhënave do të fshihet në mënyrë periodike."
 
 #: templates/web/base/reports/index.html:10
 msgid "This is a summary of all reports on this site."
-msgstr ""
+msgstr "Kjo është një përmbledhje e të gjitha raporteve në këtë faqe."
 
 #: templates/web/base/report/new/form_report.html:56
 msgid "This pothole has been here for two months and…"
-msgstr ""
+msgstr "Kjo gropë ka qenë këtu për dy muaj dhe ..."
 
 #: templates/web/base/report/update/form_update.html:59
 msgid "This problem has been fixed"
@@ -3651,7 +3648,7 @@ msgstr "Ky problem nuk ka qene i rregulluar"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
-msgstr ""
+msgstr "Ky raport është në pritje moderim."
 
 #: perllib/FixMyStreet/Script/Alerts.pm:101
 msgid "This report is currently marked as closed."
@@ -3667,27 +3664,27 @@ msgstr "Ky problem eshte i shenuar si i hapur."
 
 #: perllib/FixMyStreet/Script/Reports.pm:109
 msgid "This report was submitted anonymously"
-msgstr ""
+msgstr "Ky raport është dorëzuar në mënyrë anonime"
 
 #: perllib/FixMyStreet/Script/Reports.pm:89
 msgid "This web page also contains a photo of the problem, provided by the user."
-msgstr ""
+msgstr "Kjo web faqe përmban edhe një foto të problemit, e dhënë nga ana e përdoruesit."
 
 #: templates/web/zurich/admin/report_edit-sdm.html:119
 #: templates/web/zurich/admin/report_edit-sdm.html:78
 #: templates/web/zurich/admin/report_edit.html:106
 #: templates/web/zurich/admin/report_edit.html:144
 msgid "Time spent (in minutes):"
-msgstr ""
+msgstr "Koha e kaluar(në minuta):"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:639
 #: templates/web/base/admin/timeline.html:1
 msgid "Timeline"
-msgstr "Kohezgjatja"
+msgstr "Kohëzgjatja"
 
 #: templates/web/base/report/new/after_photo.html:1
 msgid "Tips for perfect photos"
-msgstr ""
+msgstr "Këshilla për foto sa më të mira"
 
 #: templates/web/base/admin/flagged.html:15
 #: templates/web/base/admin/index.html:55
@@ -3699,19 +3696,19 @@ msgstr "Titulli"
 #: templates/web/base/admin/template_edit.html:13
 #: templates/web/zurich/admin/template_edit.html:20
 msgid "Title:"
-msgstr ""
+msgstr "Titulli:"
 
 #: templates/web/base/alert/index.html:25
 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
-msgstr ""
+msgstr "Për të gjetur se çfarë njoftime lokale kemi për ju, ju lutem shkruani kodin postar %s ose emrin e rrugës dhe zonën:"
 
 #: templates/web/base/alert/index.html:27
 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
-msgstr ""
+msgstr "Për të gjetur se çfarë njoftime lokale kemi për ju, ju lutem shkruani kodin postar ose emrin e rrugës  dhe zonën"
 
 #: perllib/FixMyStreet/Script/Reports.pm:95
 msgid "To view a map of the precise location of this issue"
-msgstr ""
+msgstr "Për të parë një hartë të vendndodhjen e saktë të kësaj çështjeje"
 
 #: templates/web/base/admin/questionnaire.html:24
 #: templates/web/base/admin/stats.html:24
@@ -3723,35 +3720,34 @@ msgstr "Total"
 
 #: templates/web/base/report/_inspect.html:98
 msgid "Traffic management required?"
-msgstr ""
+msgstr "Menaxhimi i trafikut i nevojshëm?"
 
 #: templates/web/base/admin/user-form.html:111
 msgid "Trusted by bodies:"
-msgstr ""
+msgstr "Të besuar nga Drejtoritë:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
-msgstr ""
+msgstr "I besuar për të bërë raporte të cilat nuk duhet të kontrollhen"
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "U krijua:"
+msgstr "Të besuar:"
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
-msgstr "Provo perseri"
+msgstr "Provo përsëri"
 
 #: templates/web/base/contact/submit.html:14
 msgid "Try emailing us directly:"
-msgstr ""
+msgstr "Provoni për të na shkruar email direkt:"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
-msgstr ""
+msgstr "E pamundur të zgjidhet"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:19
@@ -3763,9 +3759,8 @@ msgid "Unconfirmed"
 msgstr "E pakonfirmuar"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Raportime te reja"
+msgstr "Raportime të pa zgjidhura"
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3773,7 +3768,7 @@ msgstr "E panjohur"
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:174
 msgid "Unknown alert type"
-msgstr ""
+msgstr "Lloj i njoftimit i panjohur"
 
 #: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
@@ -3785,7 +3780,7 @@ msgstr "Gabim i panjohur"
 #: perllib/FixMyStreet/App/Controller/Report.pm:121
 #: perllib/FixMyStreet/App/Controller/Report.pm:124
 msgid "Unknown problem ID"
-msgstr ""
+msgstr "ID problemi i panjohur"
 
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
@@ -3793,15 +3788,15 @@ msgstr "Perditesim"
 
 #: templates/web/base/admin/timeline.html:33
 msgid "Update %s created for problem %d; by %s"
-msgstr ""
+msgstr "Përditësimi %s u krijua për problemin %d; nga %s"
 
 #: templates/web/base/contact/index.html:28
 msgid "Update below added anonymously at %s"
-msgstr ""
+msgstr "Përditësimi më poshtë është shtuar anonimisht në %s"
 
 #: templates/web/base/contact/index.html:30
 msgid "Update below added by %s at %s"
-msgstr ""
+msgstr "Përditësimi më poshtë është shtuar nga %s në %s"
 
 #: templates/web/base/admin/body-form.html:138
 #: templates/web/zurich/admin/body-form.html:52
@@ -3810,7 +3805,7 @@ msgstr ""
 
 #: templates/web/base/admin/stats_by_state.html:21
 msgid "Update breakdown by state"
-msgstr ""
+msgstr "Përditësime të nën-ndara në shtete"
 
 #: db/alert_types.pl:7
 msgid "Update by {{name}}"
@@ -3827,7 +3822,7 @@ msgstr "Perditesimi shenon problemin si te rregulluar"
 
 #: templates/web/base/admin/update_edit.html:48
 msgid "Update reopened problem"
-msgstr ""
+msgstr "Përditësoni problemin e ri-hapur."
 
 #: templates/web/base/admin/body.html:110
 msgid "Update statuses"
@@ -3867,11 +3862,11 @@ msgstr "Perditesimet ne {{title}}"
 #: templates/web/base/report/display.html:0
 #: templates/web/base/report/display.html:9
 msgid "Updates to this problem, %s"
-msgstr ""
+msgstr "Përditësim në këtë problem"
 
 #: templates/web/base/admin/open311-form-fields.html:65
 msgid "Use Open311 update-sending extension"
-msgstr ""
+msgstr "Hap Open311 per linjën e dërgimit të përditësimit"
 
 #: templates/web/base/admin/contact-form.html:124
 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."
@@ -3880,7 +3875,7 @@ msgstr ""
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
 msgid "Used map"
-msgstr ""
+msgstr "Harta të përdorura"
 
 #: templates/web/base/admin/open311-form-fields.html:78
 msgid "User ID to attribute fetched comments to"
@@ -3888,7 +3883,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1681
 msgid "User flag removed"
-msgstr ""
+msgstr "Flamuri i përdoruesit është hequr"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1653
 msgid "User flagged"
@@ -3896,19 +3891,18 @@ msgstr ""
 
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
-msgstr ""
+msgstr "Përdoruesi gjen përputhje në kërkimet e emrit të përdoruesit dhe email adresës."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Perdoruesit"
 
 #: templates/web/base/admin/user-form.html:149
 msgid "Users can perform the following actions within their assigned body or area."
-msgstr ""
+msgstr "Përdoruesit mund të ndërmarrin hapat brenda drejtorisë apo fushës së tyre të dedikuar."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:400
 #: perllib/FixMyStreet/App/Controller/Admin.pm:430
@@ -3922,20 +3916,20 @@ msgstr "Vlerat e perditesuara"
 #: templates/web/zurich/admin/report_edit.html:24
 #: templates/web/zurich/admin/update_edit.html:10
 msgid "View report on site"
-msgstr ""
+msgstr "Shih raportimet në faqe"
 
 #: templates/web/base/reports/body.html:14
 msgid "View reports by ward"
-msgstr ""
+msgstr "Shih raportimet sipas lagjës"
 
 #: templates/web/base/around/display_location.html:0
 #: templates/web/base/around/display_location.html:37
 msgid "Viewing a location"
-msgstr ""
+msgstr "Duke parë lokacionin"
 
 #: templates/web/base/report/display.html:0
 msgid "Viewing a problem"
-msgstr ""
+msgstr "Duke parë problemin"
 
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
@@ -3944,42 +3938,42 @@ msgstr ""
 #: templates/web/base/alert/choose.html:6
 #: templates/web/base/around/_error_multiple.html:6
 msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
-msgstr ""
+msgstr "Kemi gjetur më shumë se një përputhje për këtë lokacion. Ne shfaqim deri në dhjetë përputhje, ju lutem bëni kërkim tjetër nese nuk gjeni lokacionin tuaj"
 
 #: templates/web/base/around/lookup_by_ref.html:5
 msgid "We found more than one match for that problem reference:"
-msgstr ""
+msgstr "Ne kemi gjetur më shumë se një përputhje për referencën e problemit"
 
 #: templates/web/base/auth/general.html:6
 #: 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 ""
+msgstr "Na nevojitet email adresa juaj, ju lutemi shkruajeni më poshtë"
 
 #: perllib/FixMyStreet/Script/Reports.pm:210
 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 ""
+msgstr "Ne kuptojmë që ky problem mund të jetë përgjegjësi e  pavarësisht ne nuk kemi ndonjë detaj kontaktues për ta. Por nese ju dini ndonjë kontakt adresë të përshtatshme, ju lutem kontaktoni."
 
 #: templates/web/base/index-steps.html:11
 msgid "We send it to the council on your behalf"
-msgstr ""
+msgstr "Ne e dërgojmë tek council në emrin tuaj"
 
 #: 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=\"/privacy\">privacy policy.</a>"
-msgstr ""
+msgstr "Ne do të përdorim të dhënat tuaja personale në përputhje me rregullat tona të privatësisë."
 
 #: 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 "Na vjen eq qe problemi nuk është rregulluar. Pse nuk provoni të ju shkruani përfaqësuesve tuaj lokal?"
 
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
-msgstr ""
+msgstr "Do të ju përgjigjemi sa më shpejtë që mundemi."
 
 #: templates/web/base/questionnaire/index.html:73
 msgid "What was your experience of getting the problem fixed?"
-msgstr ""
+msgstr "Cila ishte përvoja juaj sa i përket zgjidhjës së problemit tuaj?"
 
 #: templates/web/base/admin/category_edit.html:52
 #: templates/web/zurich/admin/body.html:18
@@ -3988,11 +3982,11 @@ msgstr "Kur redaktohet"
 
 #: templates/web/base/admin/problem_row.html:35
 msgid "When sent"
-msgstr ""
+msgstr "Kur është dërguar"
 
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
-msgstr ""
+msgstr "Whoa Testino ! Tre foto janë të mjaftueshme."
 
 #: templates/web/base/tokens/confirm_alert.html:7
 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
@@ -4003,7 +3997,7 @@ msgstr ""
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:14
 msgid "Wish"
-msgstr ""
+msgstr "Dëshirë"
 
 #: 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>."
@@ -4015,15 +4009,15 @@ msgstr ""
 
 #: templates/web/base/questionnaire/index.html:101
 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
-msgstr ""
+msgstr "Do të doni të pranoni një pyetsorë tjetër në 4 javë, të ju kujtoj të kontrollini statusin?"
 
 #: 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 ""
+msgstr "Nëse shkruani mesazhin tuaj me shkronja të mëdha është e vështirë që të lexohet, vlenë e njejta edhe për shenjat e pikësimit."
 
 #: templates/web/base/report/new/fill_in_details_form.html:4
 msgid "Wrong location? Just click again on the map."
-msgstr ""
+msgstr "Lokacion i gabuar? Vetëm klikoni përsëri në hartë."
 
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
@@ -4090,7 +4084,7 @@ msgstr ""
 #: templates/web/base/report/new/top_message_some.html:11
 #: templates/web/base/report/new/top_message_some.html:9
 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 ""
+msgstr "Ju mund të na ndihmoni duke gjetur një email kontaktues për problemet lokale dhe ta dërgoni atë tek ne."
 
 #: templates/web/base/admin/body-form.html:91
 msgid "You can mark a body as deleted if you do not want it to be active on the site."
@@ -4098,7 +4092,7 @@ msgstr ""
 
 #: templates/web/base/js/translation_strings.html:35
 msgid "You declined; please fill in the box above"
-msgstr ""
+msgstr "Ju anuluat; ju lutem plotësoni kutinë më lartë "
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4107,12 +4101,12 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:37
 #: 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 "Ju tanimë keni bashkangjitur fotografi në këtë raport. Keni parasysh që keni mundësi të bashkangjitni vetëm 3 në këtë raport (nëse dëshironi që të ngarkoni më shumë, të kaluarat do të largohen)."
 
 #: templates/web/base/questionnaire/index.html:87
 #: 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 ""
+msgstr "Ju tanimë keni bashkangjitur fotografi në këtë raport. Keni parasysh që keni mundësi të bashkangjitni vetëm 3 në këtë raport (nëse dëshironi që të ngarkoni më shumë, të kaluarat do të largohen)."
 
 #: templates/web/base/auth/sign_out.html:4
 #: templates/web/zurich/auth/sign_out.html:3
@@ -4121,22 +4115,22 @@ msgstr "Ju keni qene te shkyqur"
 
 #: 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 ""
+msgstr "Ju keni lokalizuar problemin tuaj me një pin të gjelbër në hartë. Nëse ky nuk është lokacioni i saktë, thjeshtë klikoni në hartë përsëri."
 
 #: templates/web/base/auth/change_email.html:6
 #: templates/web/zurich/tokens/confirm_problem.html:5
 #: templates/web/zurich/tokens/confirm_problem.html:6
 msgid "You have successfully confirmed your email address."
-msgstr ""
+msgstr "Ju keni konfirmuar me sukses email adresën tuaj."
 
 #: 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 "Ju jeni kyçur me sukses, ju lutem konfirmoni dhe kontrolloni nëse të dhënat tuaja janë të sakta."
 
 #: templates/web/base/my/my.html:31
 msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a problem now.</a>"
-msgstr ""
+msgstr "Ju nuk keni krijuar asnjë raport ende. Raportoni problemin tani"
 
 #: templates/web/base/my/planned.html:21
 msgid "You haven&rsquo;t shortlisted any reports yet."
@@ -4144,7 +4138,7 @@ 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 ""
+msgstr "Ju duhet të shtoni disa drejtori ( si council apo departamentet) para se raporti të mund të dërgohet. "
 
 #: templates/web/base/admin/bodies.html:11
 msgid ""
@@ -4159,9 +4153,8 @@ msgstr "Raportet tuaja"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Konfirmo llogarine"
+msgstr "Llogaria juaj"
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4185,7 +4178,7 @@ msgstr "Email adresa juaj"
 
 #: templates/web/base/report/updates-sidebar-notes.html:3
 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
-msgstr ""
+msgstr "Informatat tuaja do të përdoren në përputhje me politikën tonë të privatsisë"
 
 #: templates/web/base/auth/general.html:107
 #: templates/web/base/contact/index.html:76
@@ -4214,7 +4207,7 @@ msgstr "Numri juaj i telefonit"
 
 #: templates/web/base/questionnaire/index.html:16
 msgid "Your report"
-msgstr ""
+msgstr "Raporti juaj"
 
 #: templates/web/base/my/my.html:28
 msgid "Your reports"
@@ -4222,9 +4215,8 @@ msgstr "Raportet tuaja"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Raportet tuaja"
+msgstr "Lista juaj e shkurtë"
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4232,14 +4224,13 @@ msgstr "Perditesimet tuaja"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Email-i juaj"
+msgstr "Vetëvetja"
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
 msgid "all"
-msgstr ""
+msgstr "Të gjitha"
 
 #: templates/web/base/admin/timeline.html:4
 msgid "by %s"
@@ -4262,12 +4253,12 @@ msgstr "p.sh. ‘%s’ ose ‘%s’"
 #: templates/web/base/admin/flagged.html:51
 #: templates/web/base/admin/open311-form-fields.html:81
 msgid "edit user"
-msgstr ""
+msgstr "Ndryshoni përdoruesin"
 
 #: templates/web/base/status/stats.html:20
 #: templates/web/zurich/admin/index.html:5
 msgid "from %s different users"
-msgstr "nga %s perdorues te ndry"
+msgstr "nga %s perdorues te ndryshem"
 
 #: templates/web/base/report/_item.html:15
 #: templates/web/zurich/report/_item.html:14
@@ -4317,7 +4308,7 @@ msgstr "shenuar si i planifikuar"
 
 #: templates/web/base/report/updates.html:53
 msgid "marked as unable to fix"
-msgstr ""
+msgstr "Etiketuar si e pamundur për ta rregulluar"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
@@ -4328,12 +4319,11 @@ msgstr "n/a"
 #: templates/web/base/admin/category-checkboxes.html:8
 #: templates/web/base/admin/user-form.html:160
 msgid "none"
-msgstr ""
+msgstr "asnjë"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(opsionale)"
+msgstr "Opsionale"
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4356,7 +4346,7 @@ msgstr "ose me gjeje ne menyre automatike"
 #: templates/web/zurich/admin/report_edit.html:74
 #: templates/web/zurich/admin/report_edit.html:76
 msgid "originally entered: &ldquo;%s&rdquo;"
-msgstr ""
+msgstr "E dhënë origjinale"
 
 #: templates/web/base/admin/report_edit.html:68
 msgid "other areas:"
@@ -4369,15 +4359,15 @@ msgstr "rihapur"
 
 #: templates/web/base/admin/category_edit.html:35
 msgid "required"
-msgstr ""
+msgstr "Kërkuar"
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
-msgstr "shkyqur"
+msgstr "çkyqur"
 
 #: templates/web/base/report/new/form_report.html:13
 msgid "the local council"
-msgstr ""
+msgstr "lokal council"
 
 #: templates/web/base/report/_report_meta_info.html:2
 #: templates/web/zurich/report/_main.html:5
@@ -4394,11 +4384,11 @@ msgstr "sot"
 
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
-msgstr "perdor harten"
+msgstr "harta e përdorur"
 
 #: templates/web/base/admin/update_edit.html:37
 msgid "user is from same council as problem - %d"
-msgstr ""
+msgstr "Përdoruesi është nga council i njejtë si problemi"
 
 #: templates/web/base/admin/update_edit.html:40
 msgid "user is problem owner"
@@ -4485,24 +4475,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] ""
 msgstr[1] ""
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Te gjitha informacionet e ofruara nga ju do te dergohen te"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Te gjitha informacionet e ofruara ketu do te dergohen te <strong>%s</strong>."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "GeoRSS ne Google Maps"
-
-#~ msgid "Survey"
-#~ msgstr "Studim"
-
-#~ msgid "We never show your email"
-#~ msgstr "ne asnjëherë nuk do të shfaqim email-in tuaj"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Ju vertete deshironi ta ridergoni?"
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8282dffe9..807e8a185 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -328,8 +328,7 @@ msgstr "Samtliga kategorier"
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Alla rapporter"
@@ -1339,7 +1338,7 @@ msgstr "Göm äldre"
 
 #: templates/web/base/around/display_location.html:62
 msgid "Hide pins"
-msgstr "Göm pinnar"
+msgstr "Göm kartnålar"
 
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
@@ -1596,10 +1595,9 @@ msgid "Loading..."
 msgstr "Laddar..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Lokala RSS-flöden och epostbevakningar"
@@ -2210,8 +2208,7 @@ msgid "Please choose a property type"
 msgstr "Välj en fastighetstyp"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Vänligen korrigera felen nedan"
 
@@ -2930,8 +2927,7 @@ msgstr "Spara med en offentlig uppdatering"
 msgid "Search Reports"
 msgstr "Sök rapporter"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Sök användare"
 
@@ -3037,7 +3033,7 @@ msgstr "Visa äldre"
 
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
-msgstr "Visa pinnar"
+msgstr "Visa kartnålar"
 
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
@@ -3159,8 +3155,7 @@ msgstr "Status:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3251,8 +3246,7 @@ msgstr "Sammanfatta dina ändringar"
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3865,8 +3859,7 @@ msgstr "Användarsökningen matchar mot användares namn och e-postadresser."
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Användare"
 
diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 71816b114..951df1f0c 100644
--- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,18 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# Eda Karaman <edakaraman_92@hotmail.de>, 2015
-# Egemen Metin Turan <emturan@gmail.com>, 2016
-# Muradiye <Muradiye.ates@gmail.com>, 2015
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-07-12 09:19+0000\n"
-"Last-Translator: Egemen Metin Turan <emturan@gmail.com>\n"
-"Language-Team: Turkish (Turkey) (http://www.transifex.com/mysociety/fixmystreet/language/tr_TR/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n"
 "Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -182,9 +179,8 @@ msgid "-- Pick a property type --"
 msgstr "-- Bir özellik seçiniz --"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "Bir Taslak Seç"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -285,9 +281,8 @@ msgid "Add user"
 msgstr "Kullanıcı ekle"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Yeni kategori ekle"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -331,15 +326,13 @@ msgid "All Reports as CSV"
 msgstr "Tüm raporlar CSV olarak"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Tüm Bildirimler"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Tüm bildirimler"
@@ -365,9 +358,8 @@ msgstr "Anonim:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Kullanıcı ekle"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -379,9 +371,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Geliştirici misiniz?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -416,9 +407,8 @@ msgid "Assign to subdivision:"
 msgstr "Alt bölüm atamak:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "%s atamak"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -438,9 +428,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Toplumsal geri bildirim:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -461,9 +450,8 @@ msgid "Back"
 msgstr "Geri"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Tüm bildirimler"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -507,14 +495,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Kategori"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Kategori:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -531,9 +517,8 @@ msgid "Category"
 msgstr "Kategori"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "ör. ‘%s’ veya ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -559,9 +544,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Email adresini engelle"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -661,9 +645,8 @@ msgid "Closed by council"
 msgstr "Kurul tarafından kapatıldı"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Bildiriyi tekrar gönder"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -794,14 +777,12 @@ msgid "Create category"
 msgstr "Kategori oluştur"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Bildiri oluştur"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Kurula bildirilmemiş"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -869,9 +850,8 @@ msgid "Description"
 msgstr "Tanım"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Tanım"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -958,28 +938,24 @@ msgid "Edit body details"
 msgstr "Bölümün detaylarını düzenle"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Bölümün detaylarını düzenle"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Kategori oluştur"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Bildiri listesini filtrele"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Tüm bildirimler"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1023,9 +999,8 @@ msgstr "E-posta kara listeye eklendi"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "E-posta adresi:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1134,9 +1109,8 @@ msgstr "Örnekler:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Kategori oluştur"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1150,23 +1124,20 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "Harici URL "
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "Harici URL "
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Harici URL "
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Harici URL "
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1174,9 +1145,8 @@ msgid "Extra data:"
 msgstr "İlave veriler:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "İlave veriler:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1218,9 +1188,8 @@ msgid "Fixed - User"
 msgstr "Sorun çözüldü- Kullanıcı"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Yeni bildiriler"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1455,9 +1424,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Buraya bildireceğiniz problemin konusu ve detayları tüm herkese açık olacaktır, fakat bahse konu problem ilgili kuruma strong>bildirilmeyecektir.</strong> "
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1626,9 +1594,8 @@ msgid "Last&nbsp;update:"
 msgstr "Son&nbsp;güncelleme:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Son güncelleme:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1643,10 +1610,9 @@ msgid "Loading..."
 msgstr "Yükleniyor..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Yerel RSS bildirimi ve e-posta uyarısı"
@@ -1709,9 +1675,8 @@ msgid "Message to external body:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:71
-#, fuzzy
 msgid "Missing bodies:"
-msgstr "%s bölümler"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:446
 msgid "Missing jurisdiction_id"
@@ -1722,14 +1687,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Bildiren kişinin kişisel bilgilerini dahil et"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Bildiri oluştur"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1776,9 +1739,8 @@ msgid "Name: %s"
 msgstr "İsim: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "Bu problemin güncellemelerini RSS olarak besle"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1817,9 +1779,8 @@ msgid "New category contact added"
 msgstr "Yeni kategori bilgisi eklendi"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "E-posta adresi:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1835,15 +1796,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Şifre:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Yeni bildiriler"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1904,9 +1863,8 @@ msgid "No"
 msgstr "Hayır"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "diğer bölgeler:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2089,9 +2047,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "mySociety FixMyStreet sunucusu için Open311 API "
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311 özellikleri"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2207,9 +2164,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Fotoğraf"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2263,8 +2219,7 @@ msgid "Please choose a property type"
 msgstr "Bir özellik seçin"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "Lütfen aşağıdaki hataları düzeltiniz"
 
@@ -2291,9 +2246,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Şifre giriniz"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2419,9 +2373,8 @@ msgid "Please note:"
 msgstr "Lütfen dikkat:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Bu bildirimi neden paylaşatığınza dair lütfen bir kaç açıklama yapın"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2598,9 +2551,8 @@ msgid "Provide an update"
 msgstr "Güncellemeye izin ver"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Güncellemeye izin ver"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2617,9 +2569,8 @@ msgid "Public response:"
 msgstr "Toplumsal geri bildirim:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Toplumsal geri bildirim:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2721,9 +2672,8 @@ msgid "Recently reported problems"
 msgstr "Yakın zamanda bildirilen problemler"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Güncellemeleri yap"
+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."
@@ -2758,9 +2708,8 @@ msgid "Report"
 msgstr "Bildirim"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Bildirim"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2773,9 +2722,8 @@ msgid "Report abuse"
 msgstr "Kötüye kullanım bildir"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Bildirimler"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2885,9 +2833,8 @@ msgid "Reports published"
 msgstr "Yayınlanmış bildirimler"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Onay bekleyen bildirimler"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2922,9 +2869,8 @@ msgid "Response Template for %s"
 msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "Bir Taslak Seç"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -2992,8 +2938,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Bildirimleri ara"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Kullanıcı Ara"
 
@@ -3039,9 +2984,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Konu:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3085,9 +3029,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Tarafından paylaşıldı %s saat %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3221,8 +3164,7 @@ msgstr "Devlet:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3303,20 +3245,17 @@ msgid "Subscribe me to an email alert"
 msgstr "E-posta uyarısını benim için onayla"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Problem hakkında detaylı bilgi giriniz"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Değişiklikleri kaydet"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3383,9 +3322,8 @@ msgid "Thank you for updating this issue!"
 msgstr "Bu konuyu güncellediğiniz için teşekkür ederiz!"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "Geri bildiriminiz için teşekkür ederiz"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3604,15 +3542,13 @@ msgstr "Bu ayarlar Open311 (veya diğer back-end integration) problemini kapsaya
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Kişisel bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluğu çerçevesinde kullanılacaktır"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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 "Kişisel bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluğu çerçevesinde kullanılacaktır"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3767,9 +3703,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Oluşturuldu:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3796,9 +3731,8 @@ msgid "Unconfirmed"
 msgstr "Onaylanmamış"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Yeni bildiriler"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3907,9 +3841,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "Detayları kaydetmek için sadece adminin ekranında görünen <strong>notu</strong>  kullanın. Bilgiler kuruma gönderilmeyecek ve kimse tarafından görünmeyecektir."
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -3935,8 +3868,7 @@ msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur."
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Kullanıcılar"
 
@@ -4175,9 +4107,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Henüz herhangi bir bildirim oluşturmadınız. <a href=\"%s\">Şimdi sorun olarak bir bildiri .</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Henüz herhangi bir bildirim oluşturmadınız. <a href=\"%s\">Şimdi sorun olarak bir bildiri .</a>"
+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."
@@ -4196,9 +4127,8 @@ msgstr "Bildirimlerin"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Hesabı onayla"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4259,9 +4189,8 @@ msgstr "Bildirimlerin"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Bildirimlerin"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4269,9 +4198,8 @@ msgstr "Güncellemelerin"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "E-posta adresiniz"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4368,9 +4296,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(isteğe bağlı)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4511,45 +4438,3 @@ msgstr[0] "%d gün"
 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] "Bahsettiğiniz alanı kapsayan ilgili diğer kurullar hakkında henüz detaylı  bilgimiz <strong>yok</strong>"
-
-#~ msgid "(public)"
-#~ msgstr "(kamu)"
-
-#~ msgid "Additional Information"
-#~ msgstr "Ek Bilgi"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Buraya bildirdiğiniz tüm bilgiler gönderilecektir"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Buraya bildirdiğiniz tüm bilgiler gönderilecektir"
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Yapılandırma Son Nokta"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "Sorunun ne olduğunu, nerede ve nezamandan beri orada olduğunu açıklayın..."
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr " Google Haritadaki GeoRSS "
-
-#~ msgid "One-line summary"
-#~ msgstr "Tek-satırlık özet"
-
-#~ msgid "Survey"
-#~ msgstr "Anket"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "Özet ve tanımlamalar kamuoyuna açıklanacak (bakınız <a href=\"/privacy\">privacy policy</a>)  "
-
-#~ msgid "We never show your email"
-#~ msgstr "E-posta adresiniz gizli tutulacaktır"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "Konu ne ve nerede?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Tekrardan göndermek istiyor musun?"
diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4d4146b71..1ef5207d9 100644
--- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,17 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
-# leonid.prokopchuk <introspirit@gmail.com>, 2014
-# Vladyslav <vladislav.turenko@gmail.com>, 2014
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/mysociety/fixmystreet/language/uk_UA/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n"
 "Language: uk_UA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,9 +277,8 @@ msgid "Add user"
 msgstr "Додати користувача"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "Додати нову категорію"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
@@ -325,15 +322,13 @@ msgid "All Reports as CSV"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "Всі звіти"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "Всі звіти"
@@ -359,9 +354,8 @@ msgstr "Анонім:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "Додати користувача"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -373,9 +367,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "Ви розробник?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -410,9 +403,8 @@ msgid "Assign to subdivision:"
 msgstr "Назначити підрозділу:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "Назначити %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -432,9 +424,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "Публічна відповідь:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -455,9 +446,8 @@ msgid "Back"
 msgstr "Назад"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "Всі звіти"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -501,14 +491,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "Категорія"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "Категорія:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -525,9 +513,8 @@ msgid "Category"
 msgstr "Категорія"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "наприклад ‘%s’ чи ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -553,9 +540,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "Забанити адресу"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -645,9 +631,8 @@ msgid "Closed by council"
 msgstr "Закрито муніципалітетом"
 
 #: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
 msgid "Closed reports"
-msgstr "Перевідіслати сповіщення"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:38
 msgid "Closed:"
@@ -778,14 +763,12 @@ msgid "Create category"
 msgstr "Створити категорію"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "Створити сповіщення"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "Не прозвітовано департаменту"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -853,9 +836,8 @@ msgid "Description"
 msgstr "Опис"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "Опис"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -942,28 +924,24 @@ msgid "Edit body details"
 msgstr "Редагувати дані про орган"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "Редагувати дані про орган"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "Створити категорію"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "Фільтрувати список звітів"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "Всі звіти"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1007,9 +985,8 @@ msgstr "Пошта занесена в чорний список"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "Адреса е-пошти:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1114,9 +1091,8 @@ msgstr "Приклади:"
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "Створити категорію"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1138,14 +1114,12 @@ msgid "External URL"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "Назначити зовнішньому відділу:"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "Внутрішні нотатки"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1153,9 +1127,8 @@ msgid "Extra data:"
 msgstr "Додаткові дані:"
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "Додаткові дані:"
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1197,9 +1170,8 @@ msgid "Fixed - User"
 msgstr "Вирішено - Користувач"
 
 #: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
 msgid "Fixed reports"
-msgstr "Нові сповіщення"
+msgstr ""
 
 #: templates/web/base/admin/problem_row.html:37
 msgid "Fixed:"
@@ -1438,9 +1410,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "Якщо ви відправите проблему тут, то тема і подробиці проблеми будуть публічними, але проблема <strong>не буде</strong> відправлена департаментам."
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1609,9 +1580,8 @@ msgid "Last&nbsp;update:"
 msgstr "Останнє&nbsp;поновлення:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "Останнє поновлення:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1626,10 +1596,9 @@ msgid "Loading..."
 msgstr "Завантаження..."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "Локальний RSS потік та поштові сповіщення"
@@ -1704,14 +1673,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "Додати особисті дані автора сповіщення"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "Створити сповіщення"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1758,9 +1725,8 @@ msgid "Name: %s"
 msgstr "Ім'я: %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "RSS стрічка з оновленнями по цій проблемі"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1801,9 +1767,8 @@ msgid "New category contact added"
 msgstr "Новий контакт категорії додано"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "Адреса е-пошти:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1819,15 +1784,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "Пароль:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "Нові сповіщення"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1888,9 +1851,8 @@ msgid "No"
 msgstr "Ні"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "інші зони:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -2073,9 +2035,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Бракує jurisdiction_id"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2191,9 +2152,8 @@ msgstr ""
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "Фото"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2247,8 +2207,7 @@ msgid "Please choose a property type"
 msgstr "Будь ласка оберіть тип майна"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr ""
 
@@ -2275,9 +2234,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "Будь ласка введіть пароль"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2403,9 +2361,8 @@ msgid "Please note:"
 msgstr "Будь ласка зауважте:"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "Будь ласка додайте трохи пояснень стосовно перевідкриття сповіщення"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2582,9 +2539,8 @@ msgid "Provide an update"
 msgstr "Надішліть оновлення"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "Надішліть оновлення"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2601,9 +2557,8 @@ msgid "Public response:"
 msgstr "Публічна відповідь:"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "Публічна відповідь:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2705,9 +2660,8 @@ msgid "Recently reported problems"
 msgstr "Нещодавно перевідкриті проблеми"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "Отримувати оновлення"
+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."
@@ -2742,9 +2696,8 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "Сповіщення"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2757,9 +2710,8 @@ msgid "Report abuse"
 msgstr "Поскаржитись"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "Сповіщення"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2869,9 +2821,8 @@ msgid "Reports published"
 msgstr "Сповіщення опубліковано"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "Сповіщення очікують підтвердження"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2975,8 +2926,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "Пошук сповіщень"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Пошук користувачів"
 
@@ -3022,9 +2972,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "Тема:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3068,9 +3017,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "Опубліковано %s в %s"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3204,8 +3152,7 @@ msgstr "Стан:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3286,20 +3233,17 @@ msgid "Subscribe me to an email alert"
 msgstr "Підпишіть мене на поштові алярми"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "Введіть подробиці проблеми"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "Підтвердити зміни"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3592,15 +3536,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "Ми будем використовувати ваші персональні дані лише у відповідності до <a href=\"/faq#privacy\">політики конфіденційності.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/faq#privacy\">політики конфіденційності.</a>"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3755,9 +3697,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "Створено:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3784,9 +3725,8 @@ msgid "Unconfirmed"
 msgstr "Не підтверджено"
 
 #: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
 msgid "Unfixed reports"
-msgstr "Нові сповіщення"
+msgstr ""
 
 #: templates/web/base/report/banner.html:9
 msgid "Unknown"
@@ -3922,8 +3862,7 @@ msgstr "Пошук користувачів знайшов співпадінн
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Користувачі"
 
@@ -4160,9 +4099,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "Ви не сповістили про жодну проблему.   <a href=\"%s\">Сповістіть про проблему</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "Ви не сповістили про жодну проблему.   <a href=\"%s\">Сповістіть про проблему</a>"
+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."
@@ -4184,9 +4122,8 @@ msgstr "Ваші сповіщення"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "Підтвердити запис"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4247,9 +4184,8 @@ msgstr "Ваші сповіщення"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "Ваші сповіщення"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4257,9 +4193,8 @@ msgstr "Ваші поновлення"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "Ваша пошта"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4356,9 +4291,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(вибірково)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4521,24 +4455,3 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "Всю надану інформацію буде надіслано до"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "Всю надану інформацію буде надіслано до <strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "Налаштувати ендпойнт"
-
-#~ msgid "Survey"
-#~ msgstr "Опитування"
-
-#~ msgid "We never show your email"
-#~ msgstr "Ми ніколи не публікуєм вашу поштову адресу"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "Ми ніколи не публікуємо вашу поштову адресу чи номер телефону."
-
-#~ msgid "You really want to resend?"
-#~ msgstr "Дійсно бажаєте перевідправити?"
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index d44a0a311..6d7242b38 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-# Translators:
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: fixmystreet\n"
+"Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2016-11-08 11:39+0000\n"
-"PO-Revision-Date: 2016-05-03 09:48+0000\n"
-"Last-Translator: mySociety <transifex@mysociety.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/mysociety/fixmystreet/language/zh/)\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
+"Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -190,9 +190,8 @@ msgid "-- Pick a property type --"
 msgstr "選擇公物種類"
 
 #: templates/web/base/admin/response_templates_select.html:4
-#, fuzzy
 msgid "--Choose a template--"
-msgstr "選擇模版"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:23
 msgid "10 inch pothole on Example St, near post box"
@@ -295,18 +294,16 @@ msgid "Add user"
 msgstr "新增使用者"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:730
-#, fuzzy
 msgid "Add/edit problem categories"
-msgstr "新增種類"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:731
-#, fuzzy
 msgid "Add/edit response templates"
-msgstr "%s的回應模版"
+msgstr ""
 
 #: templates/web/base/my/my.html:67
 msgid "Added %s"
@@ -342,15 +339,13 @@ msgid "All Reports as CSV"
 msgstr "所有事件申報存成CSV格式"
 
 #: templates/web/base/admin/responsepriorities/list.html:19
-#, fuzzy
 msgid "All categories"
-msgstr "所有事件申報"
+msgstr ""
 
 #: templates/web/base/footer.html:29
 #: templates/web/base/reports/_list-filters.html:2
 #: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13
-#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr "所有事件申報"
@@ -376,9 +371,8 @@ msgstr "匿名:"
 
 #: templates/web/base/report/new/form_user_loggedin.html:20
 #: templates/web/base/report/update/form_name.html:13
-#, fuzzy
 msgid "Another user"
-msgstr "新增使用者"
+msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:16
 msgid "Are you a developer?"
@@ -390,9 +384,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
 #: templates/web/base/report/display_tools.html:6
-#, fuzzy
 msgid "Are you sure?"
-msgstr "你是程式開發者嗎?"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:75
 #: templates/web/base/admin/body.html:20
@@ -427,9 +420,8 @@ msgid "Assign to subdivision:"
 msgstr "交派給下級單位："
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:727
-#, fuzzy
 msgid "Assign users to areas"
-msgstr "派給　%s"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:214
 msgid "Assigned to %s"
@@ -449,9 +441,8 @@ msgid "Authorised staff users can be associated with the categories in which the
 msgstr ""
 
 #: templates/web/base/admin/template_edit.html:22
-#, fuzzy
 msgid "Auto-response:"
-msgstr "公眾反應"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:133
 #: templates/web/base/report/_inspect.html:42
@@ -472,9 +463,8 @@ msgid "Back"
 msgstr "回上層"
 
 #: templates/web/base/report/_main.html:6
-#, fuzzy
 msgid "Back to all reports"
-msgstr "所有事件申報"
+msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:41
 msgid "Ban email address"
@@ -518,14 +508,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
-#, fuzzy
 msgid "Categories"
-msgstr "類別"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
-#, fuzzy
 msgid "Categories:"
-msgstr "類別:"
+msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
@@ -542,9 +530,8 @@ msgid "Category"
 msgstr "類別"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:854
-#, fuzzy
 msgid "Category changed from ‘%s’ to ‘%s’"
-msgstr "例如 ‘%s’ 或 ‘%s’"
+msgstr ""
 
 #: templates/web/base/admin/stats.html:58
 #: templates/web/base/admin/stats_fix_rate.html:1
@@ -570,9 +557,8 @@ msgstr ""
 #: templates/web/base/auth/change_email.html:1
 #: templates/web/base/auth/change_email.html:3
 #: templates/web/base/auth/change_email.html:30
-#, fuzzy
 msgid "Change email address"
-msgstr "禁止之電子郵件"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:1
 #: templates/web/base/auth/change_password.html:16
@@ -802,14 +788,12 @@ msgid "Create category"
 msgstr "創建類別"
 
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#, fuzzy
 msgid "Create priority"
-msgstr "創建申報"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "Create reports/updates as the council"
-msgstr "未呈報給地方政府"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates on a user's behalf"
@@ -877,9 +861,8 @@ msgid "Description"
 msgstr "描述"
 
 #: templates/web/base/admin/responsepriorities/edit.html:17
-#, fuzzy
 msgid "Description:"
-msgstr "描述"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:33
 #: templates/web/zurich/report/new/fill_in_details_form.html:45
@@ -969,28 +952,24 @@ msgid "Edit body details"
 msgstr "編輯有關單位細節"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:724
-#, fuzzy
 msgid "Edit other users' details"
-msgstr "編輯有關單位細節"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:709
-#, fuzzy
 msgid "Edit report category"
-msgstr "創建類別"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:710
-#, fuzzy
 msgid "Edit report priority"
-msgstr "過濾初次申報　"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:708
-#, fuzzy
 msgid "Edit reports"
-msgstr "已處理之申報　"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:0
 #: templates/web/base/admin/report_edit.html:14
@@ -1034,9 +1013,8 @@ msgstr "電子郵件列入濫發名單"
 #: templates/web/base/admin/contact-form.html:36
 #: templates/web/base/report/new/form_user_loggedin.html:28
 #: templates/web/base/report/update/form_name.html:19
-#, fuzzy
 msgid "Email address"
-msgstr "電子郵件:"
+msgstr ""
 
 #: templates/web/base/tokens/confirm_alert.html:6
 msgid "Email alert created"
@@ -1146,9 +1124,8 @@ msgstr "範例："
 
 #: templates/web/base/admin/report_edit.html:128
 #: templates/web/base/report/_inspect.html:37
-#, fuzzy
 msgid "Existing category"
-msgstr "創建類別"
+msgstr ""
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
@@ -1162,23 +1139,20 @@ msgid "Extern"
 msgstr "外圍"
 
 #: templates/web/base/admin/report_edit.html:97
-#, fuzzy
 msgid "External ID"
-msgstr "外部網址"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:87
 msgid "External URL"
 msgstr "外部網址"
 
 #: templates/web/base/admin/report_edit.html:99
-#, fuzzy
 msgid "External body"
-msgstr "外部網址"
+msgstr ""
 
 #: templates/web/base/admin/report_edit.html:101
-#, fuzzy
 msgid "External team"
-msgstr "外部網址"
+msgstr ""
 
 #: templates/web/base/admin/category_edit.html:25
 #: templates/web/base/admin/report_edit.html:94
@@ -1186,9 +1160,8 @@ msgid "Extra data:"
 msgstr "其它資料："
 
 #: templates/web/base/report/_inspect.html:107
-#, fuzzy
 msgid "Extra details"
-msgstr "其它資料："
+msgstr ""
 
 #: templates/web/base/contact/submit.html:13
 msgid "Failed to send message"
@@ -1471,9 +1444,8 @@ msgstr ""
 
 #: templates/web/base/report/new/top_message_none.html:10
 #: templates/web/base/report/new/top_message_none.html:9
-#, fuzzy
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
-msgstr "您在此交付投訴問題的主旨與細節都將在此公開, 但此問題 <strong>n並不會</strong> 被呈遞給地方政府。"
+msgstr ""
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1571,9 +1543,8 @@ msgid "Incorrect has_photo value \"%s\""
 msgstr "不正確的照片值數 \"%s\""
 
 #: templates/web/base/admin/contact-form.html:84
-#, fuzzy
 msgid "Inspection required"
-msgstr "要求提供照片"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Instruct contractors to fix problems"
@@ -1656,9 +1627,8 @@ msgid "Last&nbsp;update:"
 msgstr "上一次更新:"
 
 #: templates/web/base/reports/_list-filters.html:38
-#, fuzzy
 msgid "Least recently updated"
-msgstr "上回更新:"
+msgstr ""
 
 #: templates/web/base/admin/body-form.html:127
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
@@ -1673,10 +1643,9 @@ msgid "Loading..."
 msgstr "載入中...."
 
 #: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3
-#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5
-#: templates/web/base/alert/updates.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
+#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: 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 "當地問題訂閱與電郵通知"
@@ -1751,14 +1720,12 @@ msgid "Moderate"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:707
-#, fuzzy
 msgid "Moderate report details"
-msgstr "包括申報人的個人細節"
+msgstr ""
 
 #: templates/web/base/report/_main.html:126
-#, fuzzy
 msgid "Moderate this report"
-msgstr "創建申報"
+msgstr ""
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1805,9 +1772,8 @@ msgid "Name: %s"
 msgstr "名字： %s"
 
 #: templates/web/base/report/_inspect.html:23
-#, fuzzy
 msgid "Navigate to this problem"
-msgstr "更新問題, %s"
+msgstr ""
 
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
 #: perllib/FixMyStreet/Geocode/OSM.pm:145
@@ -1848,9 +1814,8 @@ msgid "New category contact added"
 msgstr "新增類別承辦 人"
 
 #: templates/web/base/auth/change_email.html:26
-#, fuzzy
 msgid "New email address:"
-msgstr "電子郵件:"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:109
 #: templates/web/zurich/admin/report_edit.html:137
@@ -1866,15 +1831,13 @@ msgid "New note to DM:"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:35
-#, fuzzy
 msgid "New password:"
-msgstr "密碼:"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:4
 #: templates/web/base/admin/responsepriorities/list.html:32
-#, fuzzy
 msgid "New priority"
-msgstr "新的申報　"
+msgstr ""
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1935,9 +1898,8 @@ msgid "No"
 msgstr "無"
 
 #: templates/web/base/admin/user-form.html:66
-#, fuzzy
 msgid "No area"
-msgstr "其它地區:"
+msgstr ""
 
 #: templates/web/base/admin/user-form.html:37
 msgid "No body"
@@ -1994,15 +1956,10 @@ msgstr "沒有"
 
 #: templates/web/base/admin/user-form.html:58
 #: templates/web/base/admin/user-form.html:59
-#, fuzzy
 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 ""
-"一般(公眾)用戶不會與 <strong>政府相關單位</strong>有所聯繫<br>\n"
-"有權限的工作人員用戶可能和其代表政府機關相關聯<br>\n"
-"這要看具體落實執行狀況，工作人員可能有權使用控制台(其關構下的\n"
-"所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。"
 
 #: templates/web/base/admin/user-form.html:28
 #: templates/web/base/admin/user-form.html:29
@@ -2131,9 +2088,8 @@ msgid "Open311 API for the mySociety FixMyStreet server"
 msgstr "Open311 API for the mySociety FixMyStreet server"
 
 #: templates/web/base/admin/open311-form-fields.html:34
-#, fuzzy
 msgid "Open311 Jurisdiction"
-msgstr "Open311 規範　"
+msgstr ""
 
 #: templates/web/base/open311/index.html:72
 msgid "Open311 initiative web page"
@@ -2249,9 +2205,8 @@ msgstr "要求提供照片"
 #: templates/web/base/report/new/form_report.html:28
 #: templates/web/base/report/update/form_update.html:7
 #: templates/web/zurich/report/new/fill_in_details_form.html:20
-#, fuzzy
 msgid "Photos"
-msgstr "照片"
+msgstr ""
 
 #: templates/web/base/alert/list.html:23
 msgid "Photos of recent nearby reports"
@@ -2305,8 +2260,7 @@ msgid "Please choose a property type"
 msgstr "選擇公物種類"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:396
-#: templates/web/base/admin/bodies.html:4
-#: templates/web/base/admin/body.html:11
+#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
 msgid "Please correct the errors below"
 msgstr "請更正下方之錯誤"
 
@@ -2336,9 +2290,8 @@ msgid "Please enter a name"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:478
-#, fuzzy
 msgid "Please enter a name for this body"
-msgstr "請輸入密碼"
+msgstr ""
 
 #: templates/web/base/auth/change_password.html:22
 #: templates/web/base/auth/change_password.html:25
@@ -2464,9 +2417,8 @@ msgid "Please note:"
 msgstr "請加註記"
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:335
-#, fuzzy
 msgid "Please provide a public update for this report."
-msgstr "如果您是再次申報，請說明原因"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
 msgid "Please provide some explanation as to why you're reopening this report"
@@ -2643,9 +2595,8 @@ msgid "Provide an update"
 msgstr "提供更新資訊"
 
 #: templates/web/base/report/update/form_name.html:9
-#, fuzzy
 msgid "Provide update as"
-msgstr "提供更新資訊"
+msgstr ""
 
 #: templates/web/base/auth/general.html:112
 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
@@ -2662,9 +2613,8 @@ msgid "Public response:"
 msgstr "公眾反應"
 
 #: templates/web/base/report/_inspect.html:125
-#, fuzzy
 msgid "Public update:"
-msgstr "公眾反應"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit.html:123
 #: templates/web/zurich/admin/stats.html:38
@@ -2766,9 +2716,8 @@ msgid "Recently reported problems"
 msgstr "近期申報之問題　"
 
 #: templates/web/base/reports/_list-filters.html:37
-#, fuzzy
 msgid "Recently updated"
-msgstr "取得更新"
+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."
@@ -2803,9 +2752,8 @@ msgid "Report"
 msgstr "提報　"
 
 #: templates/web/base/report/_inspect.html:11
-#, fuzzy
 msgid "Report ID:"
-msgstr "提報　"
+msgstr ""
 
 #: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
 #: templates/web/zurich/footer.html:19
@@ -2818,9 +2766,8 @@ msgid "Report abuse"
 msgstr "申報濫用"
 
 #: templates/web/base/report/new/form_user_loggedin.html:16
-#, fuzzy
 msgid "Report as"
-msgstr "申報"
+msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Rss.pm:298
 msgid "Report on %s"
@@ -2930,9 +2877,8 @@ msgid "Reports published"
 msgstr "己公開之申報"
 
 #: templates/web/base/admin/index.html:50
-#, fuzzy
 msgid "Reports waiting to be sent"
-msgstr "待核實之申報"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:89
 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."
@@ -2955,24 +2901,20 @@ msgid "Response Priorities"
 msgstr ""
 
 #: templates/web/base/admin/responsepriorities/list.html:1
-#, fuzzy
 msgid "Response Priorities for %s"
-msgstr "%s的回應模版"
+msgstr ""
 
 #: templates/web/base/admin/responsepriorities/edit.html:1
-#, fuzzy
 msgid "Response Priority for %s"
-msgstr "%s的回應模版"
+msgstr ""
 
 #: templates/web/base/admin/template_edit.html:1
-#, fuzzy
 msgid "Response Template for %s"
-msgstr "%s的回應模版"
+msgstr ""
 
 #: templates/web/base/admin/templates_index.html:1
-#, fuzzy
 msgid "Response Templates"
-msgstr "%s的回應模版"
+msgstr ""
 
 #: templates/web/base/admin/templates.html:1
 #: templates/web/base/admin/templates.html:4
@@ -3040,8 +2982,7 @@ msgstr ""
 msgid "Search Reports"
 msgstr "搜尋申報"
 
-#: templates/web/base/admin/index.html:29
-#: templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "搜尋使用者"
 
@@ -3087,9 +3028,8 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
 msgstr "選擇您要想的通知方式或點選RSS訂閱按鈕，或者輸入您的電子郵件以收受通知。"
 
 #: templates/web/base/admin/category-checkboxes.html:6
-#, fuzzy
 msgid "Select:"
-msgstr "主旨:"
+msgstr ""
 
 #: templates/web/base/admin/open311-form-fields.html:109
 msgid "Send extended Open311 statuses with service request updates"
@@ -3133,9 +3073,8 @@ msgid "Shortlisted"
 msgstr ""
 
 #: templates/web/base/report/_main.html:140
-#, fuzzy
 msgid "Shortlisted by %s"
-msgstr "由 %s 在 %s 張貼"
+msgstr ""
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3272,8 +3211,7 @@ msgstr "陳述:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65
-#: templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3354,20 +3292,17 @@ msgid "Subscribe me to an email alert"
 msgstr "加入通知信件"
 
 #: templates/web/base/report/new/form_report.html:19
-#, fuzzy
 msgid "Summarise the problem"
-msgstr "請在此填寫問題的細節"
+msgstr ""
 
 #: templates/web/base/admin/contact-form.html:129
-#, fuzzy
 msgid "Summarise your changes"
-msgstr "送出更新"
+msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:638
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:382
 #: templates/web/base/admin/bodies.html:29
-#: templates/web/base/admin/index.html:1
-#: templates/web/base/status/index.html:1
+#: 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
@@ -3434,9 +3369,8 @@ msgid "Thank you for updating this issue!"
 msgstr "感謝您更新此狀況"
 
 #: templates/web/base/contact/submit.html:6
-#, fuzzy
 msgid "Thank you for your enquiry"
-msgstr "感謝您的回饋"
+msgstr ""
 
 #: templates/web/base/questionnaire/completed.html:5
 msgid "Thank you for your feedback"
@@ -3671,15 +3605,13 @@ msgstr ""
 
 #: templates/web/base/report/new/councils_text.html:3
 #: templates/web/base/report/new/councils_text.html:4
-#, fuzzy
 msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
-msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
-#, fuzzy
 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=\"/privacy\">本站隱私權政策</a>作處理使用"
+msgstr ""
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3840,9 +3772,8 @@ msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
 #: templates/web/base/admin/user-form.html:119
-#, fuzzy
 msgid "Trusted:"
-msgstr "建立:"
+msgstr ""
 
 #: templates/web/base/js/translation_strings.html:29
 msgid "Try again"
@@ -3979,9 +3910,8 @@ msgid "Use Open311 update-sending extension"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:124
-#, fuzzy
 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 "使用<strong>記事本</strong> 來記錄給管理員可看到的細節報告。這部份不會公開，也不會送給相關單位。"
+msgstr ""
 
 #: templates/web/zurich/admin/report_edit-sdm.html:50
 #: templates/web/zurich/admin/report_edit.html:69
@@ -4007,8 +3937,7 @@ msgstr "用戶找到相符的名稱與電子郵件"
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
 #: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/base/admin/flagged.html:29
-#: templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "使用者"
 
@@ -4248,9 +4177,8 @@ msgid "You haven&rsquo;t created any reports yet.  <a href=\"%s\">Report a probl
 msgstr "您當未創建任何申報，<a href=\"%s\">立即提供申報</a>"
 
 #: templates/web/base/my/planned.html:21
-#, fuzzy
 msgid "You haven&rsquo;t shortlisted any reports yet."
-msgstr "您當未創建任何申報，<a href=\"%s\">立即提供申報</a>"
+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."
@@ -4272,9 +4200,8 @@ msgstr "您的申報　"
 
 #: templates/web/base/auth/change_password.html:11
 #: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
-#, fuzzy
 msgid "Your account"
-msgstr "確認帳戶"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
@@ -4335,9 +4262,8 @@ msgstr "你作的申報"
 
 #: templates/web/base/my/planned.html:0 templates/web/base/my/planned.html:18
 #: templates/web/base/my/planned.html:5
-#, fuzzy
 msgid "Your shortlist"
-msgstr "您的申報　"
+msgstr ""
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4345,9 +4271,8 @@ msgstr "更新"
 
 #: templates/web/base/report/new/form_user_loggedin.html:18
 #: templates/web/base/report/update/form_name.html:11
-#, fuzzy
 msgid "Yourself"
-msgstr "您的電子郵件"
+msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
 #: templates/web/base/admin/user-form.html:159
@@ -4444,9 +4369,8 @@ msgid "none"
 msgstr ""
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "optional"
-msgstr "(任選)"
+msgstr ""
 
 #: templates/web/base/alert/_list.html:86
 msgid "or"
@@ -4481,9 +4405,8 @@ msgid "reopened"
 msgstr "重啟申報"
 
 #: templates/web/base/admin/category_edit.html:35
-#, fuzzy
 msgid "required"
-msgstr "要求提供照片"
+msgstr ""
 
 #: templates/web/zurich/footer.html:13
 msgid "sign out"
@@ -4588,45 +4511,3 @@ msgstr[0] "%d 日期"
 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] "我們<strong>尚未<strong>有該區域其它單位之細節　"
-
-#~ msgid "(public)"
-#~ msgstr "(公開)"
-
-#~ msgid "Additional Information"
-#~ msgstr "其餘資訊"
-
-#~ msgid "All the information you provide here will be sent to"
-#~ msgstr "你所提供的資訊即將送出"
-
-#~ msgid "All the information you provide here will be sent to <strong>%s</strong>."
-#~ msgstr "所有您提供的资訊將送出給<strong>%s</strong>."
-
-#~ msgid "Configure Endpoint"
-#~ msgstr "組態端 點"
-
-#~ msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
-#~ msgstr "說明什麼壞掉故障了，確切的地點以及它置於此處有多久了"
-
-#~ msgid "GeoRSS on Google Maps"
-#~ msgstr "google 地圖上的地理RSS"
-
-#~ msgid "One-line summary"
-#~ msgstr "一句總結"
-
-#~ msgid "Survey"
-#~ msgstr "調查"
-
-#~ msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
-#~ msgstr "總結與描述將會公開(請見我們的 <a href=\"/privacy\">隱私權政策</a>)."
-
-#~ msgid "We never show your email"
-#~ msgstr "我們不會公開您的電子郵件"
-
-#~ msgid "We never show your email address or phone number."
-#~ msgstr "我們不會公開您的電子郵件或是電話號碼"
-
-#~ msgid "What’s the issue, and where is it?"
-#~ msgstr "什麼樣的問題，地點是在?"
-
-#~ msgid "You really want to resend?"
-#~ msgstr "您真的要再送出一次嗎"
-- 
cgit v1.2.3


From 2fde5b1ee5df7f8a931908656a2563885adb141d Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Feb 2017 10:23:30 +0000
Subject: Update translations with new source strings.

---
 locale/FixMyStreet.po                         | 450 ++++++++++---------
 locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po    | 603 +++++++++++++++-----------
 locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po | 552 +++++++++++++----------
 locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po | 564 +++++++++++++-----------
 locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po    | 567 +++++++++++++-----------
 locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po | 552 +++++++++++++----------
 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 547 +++++++++++++----------
 locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 550 +++++++++++++----------
 locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po | 552 +++++++++++++----------
 locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po    | 552 +++++++++++++----------
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 556 ++++++++++++++----------
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 556 ++++++++++++++----------
 locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 530 ++++++++++++----------
 locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po    | 560 +++++++++++++-----------
 locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po    | 551 +++++++++++++----------
 locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po | 533 +++++++++++++----------
 locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po    | 540 +++++++++++++----------
 locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po | 539 +++++++++++++----------
 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 556 ++++++++++++++----------
 locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po | 549 +++++++++++++----------
 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 548 +++++++++++++----------
 locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po    | 551 +++++++++++++----------
 locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 530 ++++++++++++----------
 locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po    | 576 +++++++++++++-----------
 locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po    | 556 ++++++++++++++----------
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 556 ++++++++++++++----------
 locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po | 540 +++++++++++++----------
 locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po | 564 +++++++++++++-----------
 locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po    | 540 +++++++++++++----------
 29 files changed, 8995 insertions(+), 6925 deletions(-)

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 3e6b8215e..b7ad92f5a 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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+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:639 perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41 templates/web/base/admin/users.html:32
+#: templates/web/base/admin/report_blocks.html:43 templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
 
@@ -130,11 +130,11 @@ msgstr ""
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27 templates/web/zurich/report/_item.html:19
+#: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:25 templates/web/zurich/report/_item.html:17
+#: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr ""
 
@@ -150,19 +150,19 @@ msgstr ""
 msgid "(optional)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231 perllib/FixMyStreet/App/Controller/Report/New.pm:650 perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -177,8 +177,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -199,11 +199,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -211,7 +211,7 @@ msgstr ""
 msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
 msgstr ""
 
@@ -234,23 +234,23 @@ msgstr ""
 msgid "Add new category"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:27
+#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:14 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
-#: templates/web/base/admin/user_edit.html:4 templates/web/base/admin/users.html:48
+#: templates/web/base/admin/user_edit.html:4 templates/web/base/admin/users.html:48 templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Added %s"
 msgstr ""
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:140 templates/web/base/admin/update_edit.html:23
+#: templates/web/base/admin/report_edit.html:134 templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr ""
 
@@ -354,7 +354,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -378,7 +378,7 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133 templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401 templates/web/zurich/report/_item.html:9
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402 templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
 
@@ -398,11 +398,11 @@ msgstr ""
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56
+#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:730 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56
 msgid "Bodies"
 msgstr ""
 
@@ -426,10 +426,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650 templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
 msgstr ""
@@ -438,7 +434,7 @@ msgstr ""
 msgid "Categories:"
 msgstr ""
 
-#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:33 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50
+#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:32 templates/web/base/report/_item.html:82 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50
 msgid "Category"
 msgstr ""
 
@@ -450,7 +446,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100
+#: templates/web/base/admin/report_edit.html:119 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100
 msgid "Category:"
 msgstr ""
 
@@ -503,6 +499,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72 templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
 msgstr ""
@@ -527,7 +527,7 @@ msgstr ""
 msgid "Click the link in our confirmation email to sign in."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:43 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31
 msgid "Closed"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649 perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36 templates/web/zurich/admin/template_edit.html:29
+#: templates/web/base/admin/template_edit.html:46 templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:40 templates/web/zurich/admin/template_edit.html:33
+#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
 
@@ -737,18 +737,30 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:71
+msgid "Duplicate of"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:81
+msgid "Duplicates"
+msgstr ""
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -757,7 +769,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15 templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -769,11 +781,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -809,7 +821,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -825,11 +837,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:147 templates/web/base/admin/update_edit.html:35 templates/web/base/admin/user-form.html:19 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6
+#: templates/web/base/admin/report_edit.html:141 templates/web/base/admin/update_edit.html:35 templates/web/base/admin/user-form.html:19 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6
 msgid "Email:"
 msgstr ""
 
@@ -884,7 +896,7 @@ msgstr ""
 msgid "Enter details of the problem"
 msgstr ""
 
-#: templates/web/base/errors/generic.html:1 templates/web/base/errors/generic.html:4 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/errors/generic.html:8 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 ""
 
@@ -900,7 +912,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:128 templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -932,7 +944,7 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116 templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -952,15 +964,15 @@ msgstr ""
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -976,7 +988,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -996,7 +1008,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/report_edit.html:153 templates/web/base/admin/user-form.html:100
+#: templates/web/base/admin/report_edit.html:147 templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
 
@@ -1028,7 +1040,7 @@ msgstr ""
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:12
+#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr ""
 
@@ -1048,7 +1060,7 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:41 templates/web/zurich/admin/stats.html:26
+#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:44 templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
 
@@ -1056,7 +1068,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1092,7 +1104,7 @@ msgstr ""
 msgid "Hi %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
 msgstr ""
 
@@ -1128,7 +1140,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1164,6 +1176,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1214,7 +1230,7 @@ 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 ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8
 msgid "In progress"
 msgstr ""
 
@@ -1246,7 +1262,7 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1254,7 +1270,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr ""
 
@@ -1262,15 +1278,15 @@ msgstr ""
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
 msgstr ""
 
@@ -1306,7 +1322,11 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1346,6 +1366,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1370,7 +1394,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr ""
 
@@ -1390,7 +1414,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1398,7 +1422,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1410,7 +1434,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1418,7 +1442,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:145 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/user-form.html:16 templates/web/zurich/admin/stats.html:41
+#: templates/web/base/admin/report_edit.html:139 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/user-form.html:16 templates/web/zurich/admin/stats.html:41
 msgid "Name:"
 msgstr ""
 
@@ -1426,7 +1450,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1520,7 +1544,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1528,7 +1552,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:143 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55
+#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55
 msgid "No"
 msgstr ""
 
@@ -1544,7 +1568,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr ""
 
@@ -1596,7 +1620,7 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
 msgstr ""
 
@@ -1664,11 +1688,11 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18
 msgid "Open"
 msgstr ""
 
@@ -1708,7 +1732,7 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056 perllib/FixMyStreet/App/Controller/Report/New.pm:650 perllib/FixMyStreet/App/Controller/Report/New.pm:651 perllib/FixMyStreet/DB/Result/Problem.pm:594 perllib/FixMyStreet/DB/Result/Problem.pm:601 perllib/FixMyStreet/DB/Result/Problem.pm:608 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/DB/Result/Problem.pm:626 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
 msgstr ""
 
@@ -1724,7 +1748,7 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr ""
 
@@ -1752,7 +1776,7 @@ msgstr ""
 msgid "Phone number (optional)"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:87 templates/web/base/admin/report_edit.html:152 templates/web/base/admin/user-form.html:21 templates/web/zurich/admin/stats.html:39
+#: perllib/FixMyStreet/Script/Reports.pm:87 templates/web/base/admin/report_edit.html:146 templates/web/base/admin/user-form.html:21 templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
 msgstr ""
 
@@ -1780,7 +1804,7 @@ msgstr ""
 msgid "Place pin on map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9
 msgid "Planned"
 msgstr ""
 
@@ -1796,11 +1820,11 @@ msgstr ""
 msgid "Please check your email address is correct"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:837 perllib/FixMyStreet/App/Controller/Report/New.pm:860 perllib/FixMyStreet/DB/Result/Problem.pm:440 templates/web/base/js/translation_strings.html:9
+#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:868 perllib/FixMyStreet/DB/Result/Problem.pm:441 templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -1819,11 +1843,11 @@ msgstr ""
 msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:351 perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/base/js/translation_strings.html:2
+#: perllib/FixMyStreet/App/Controller/Admin.pm:351 perllib/FixMyStreet/DB/Result/Comment.pm:127 templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -1835,11 +1859,11 @@ msgstr ""
 msgid "Please enter a password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:423 templates/web/base/js/translation_strings.html:3
+#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:424 templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1356 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16
 msgid "Please enter a valid email"
 msgstr ""
 
@@ -1847,7 +1871,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426 templates/web/base/js/translation_strings.html:4
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427 templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
 
@@ -1867,7 +1891,7 @@ msgstr ""
 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.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:123 perllib/FixMyStreet/DB/Result/Problem.pm:434 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:435 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
 msgstr ""
 
@@ -1899,7 +1923,7 @@ msgstr ""
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -1923,19 +1947,19 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -1951,7 +1975,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -1967,19 +1991,19 @@ msgstr ""
 msgid "Please write your update here"
 msgstr ""
 
-#: templates/web/base/contact/index.html:105 templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:14 templates/web/base/report/update/form_user_loggedout_password.html:10
+#: templates/web/base/contact/index.html:103 templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:14 templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -1995,7 +2019,7 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96 templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2007,10 +2031,14 @@ msgstr ""
 msgid "Privacy and cookies"
 msgstr ""
 
-#: templates/web/base/admin/body.html:91 templates/web/base/admin/contact-form.html:74 templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/body.html:91 templates/web/base/admin/contact-form.html:74 templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr ""
 
+#: templates/web/base/report/new/form_user.html:1
+msgid "Private details"
+msgstr ""
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr ""
@@ -2043,11 +2071,11 @@ msgstr ""
 msgid "Problems"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr ""
 
@@ -2059,7 +2087,7 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
 msgstr ""
 
@@ -2080,7 +2108,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
-#: templates/web/base/report/update-form.html:6
+#: templates/web/base/report/duplicate-no-updates.html:2 templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr ""
 
@@ -2096,11 +2124,15 @@ msgstr ""
 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_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241 templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2120,11 +2152,11 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:23 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:40
+#: templates/web/base/alert/_list.html:23 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr ""
 
@@ -2148,7 +2180,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/Default.pm:835 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
 msgstr ""
 
@@ -2160,11 +2192,11 @@ msgstr ""
 msgid "RSS feed of recent local problems"
 msgstr ""
 
-#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:40
+#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:42
+#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -2185,7 +2217,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2193,11 +2225,11 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:24
+#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2205,7 +2237,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/update_edit.html:35
+#: templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
 msgstr ""
 
@@ -2217,7 +2249,7 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2225,7 +2257,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:9
+#: templates/web/base/report/display_tools.html:10 templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
 
@@ -2245,7 +2277,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605 templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606 templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2253,7 +2285,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621 templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630 templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2265,27 +2297,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2381,11 +2413,11 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 perllib/FixMyStreet/App/Controller/Admin.pm:1728 templates/web/base/admin/report_edit.html:169 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 perllib/FixMyStreet/App/Controller/Admin.pm:1730 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 templates/web/base/admin/report_edit.html:170 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
 msgstr ""
 
@@ -2393,15 +2425,19 @@ msgstr ""
 msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:9
+#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:36 templates/web/base/report/_inspect.html:142 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
+#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:150 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2433,6 +2469,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39 templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
 msgstr ""
@@ -2473,23 +2513,23 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -2552,7 +2592,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48
 msgid "Sorry, we could not find that location."
 msgstr ""
 
@@ -2588,11 +2628,11 @@ msgstr ""
 msgid "Start Date:"
 msgstr ""
 
-#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/report/_inspect.html:67 templates/web/base/report/update/form_update.html:39
+#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:66 templates/web/base/report/_item.html:86 templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:75 templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:151 templates/web/zurich/admin/update_edit.html:17
+#: templates/web/base/admin/report_edit.html:116 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:75 templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:151 templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr ""
 
@@ -2620,7 +2660,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -2632,7 +2672,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:180 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38
+#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38
 msgid "Submit changes"
 msgstr ""
 
@@ -2644,7 +2684,7 @@ msgstr ""
 msgid "Submitted"
 msgstr ""
 
-#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:49
+#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -2880,7 +2920,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28
 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
 msgstr ""
 
@@ -2954,7 +2994,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:874 perllib/FixMyStreet/App/Controller/Report/New.pm:918 perllib/FixMyStreet/App/Controller/Report/New.pm:964 perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 perllib/FixMyStreet/App/Controller/Report/New.pm:926 perllib/FixMyStreet/App/Controller/Report/New.pm:972 perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr ""
 
@@ -2978,6 +3018,10 @@ msgstr ""
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 perllib/FixMyStreet/Cobrand/Zurich.pm:162 templates/web/zurich/report/_main.html:14
 msgid "This report is awaiting moderation."
 msgstr ""
@@ -3038,7 +3082,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107 templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3046,7 +3090,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3062,11 +3106,11 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:21 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18
 msgid "Unconfirmed"
 msgstr ""
 
@@ -3082,7 +3126,7 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530 perllib/FixMyStreet/App/Controller/Photo.pm:109 templates/web/base/js/translation_strings.html:38
+#: perllib/FixMyStreet/App/Controller/Photo.pm:109 perllib/FixMyStreet/App/Controller/Root.pm:124 templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
 
@@ -3090,6 +3134,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3138,7 +3186,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1224 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1223 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857
 msgid "Updated!"
 msgstr ""
 
@@ -3146,7 +3194,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3175,11 +3223,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3187,7 +3235,7 @@ msgstr ""
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:723 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
+#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:724 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
@@ -3263,6 +3311,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3299,7 +3351,7 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
-#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:142 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53
+#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53
 msgid "Yes"
 msgstr ""
 
@@ -3307,11 +3359,11 @@ msgstr ""
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -3327,7 +3379,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -3405,7 +3457,7 @@ msgstr ""
 msgid "Your account"
 msgstr ""
 
-#: templates/web/base/alert/_list.html:90 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:44 templates/web/base/report/display_tools.html:47 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/base/alert/_list.html:90 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:81 templates/web/base/report/display_tools.html:46 templates/web/base/report/display_tools.html:49 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:53
 msgid "Your email"
 msgstr ""
 
@@ -3417,7 +3469,7 @@ msgstr ""
 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
 msgstr ""
 
-#: templates/web/base/auth/general.html:107 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:29 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63
+#: templates/web/base/auth/general.html:107 templates/web/base/contact/index.html:74 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:29 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63
 msgid "Your name"
 msgstr ""
 
@@ -3481,51 +3533,51 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15 templates/web/zurich/report/_item.html:14
+#: templates/web/base/report/_item.html:54 templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr ""
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28 templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261 perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -3557,7 +3609,7 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29 templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -3601,52 +3653,45 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 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:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/front/stats.html:25
+#: templates/web/base/report/_support.html:6
 #, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
+msgid "%d supporter"
+msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/report/new/top_message_none.html:3
+#: perllib/Utils.pm:221
 #, 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."
+msgid "%d week"
+msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:220
+#: templates/web/base/front/stats.html:19
 #, perl-format
-msgid "%d week"
-msgid_plural "%d weeks"
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -3657,17 +3702,17 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -3677,3 +3722,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
index 620602b26..34b63e670 100644
--- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ar.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "و"
@@ -122,7 +122,7 @@ msgstr "دائرة %s، %s"
 msgid "%s, within %s ward"
 msgstr "%s، ضمن دائرة %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> المساهمون"
 
@@ -130,7 +130,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(الخلل وموقع الخلل)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(البريد في لائحة المسيئين)"
@@ -154,12 +154,10 @@ msgstr "(المسافة الإفتراضية التي تغطي مايقارب 20
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(يمكن بدلاً من ذلك تخصيص موجز RSS، ضمن %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(مغلق)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(تم الإصلاح)"
@@ -168,7 +166,7 @@ msgstr "(تم الإصلاح)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "( مثل الكتابة على الجدران ، رمي النفايات في الاماكن الغير مخصصة ، بلاطات ارصفة مكسورة او انارة الشوارع)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(لم ترسل الى الجهة المسئولة)"
 
@@ -176,21 +174,21 @@ msgstr "(لم ترسل الى الجهة المسئولة)"
 msgid "(optional)"
 msgstr "(إختياري)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(أرسل لكليهما)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "--إختر تصنيف--"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- إختر نوع العقار--"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "-اختر قالب---"
 
@@ -209,8 +207,8 @@ msgstr ""
 "              هذا هو السبب المرجح وراء كون \"منطقة التغطية\" فارغة (أدناه).<br>\n"
 "              هل تريد إضافة بعض <code>MAPIT_TYPES</code> إلى ملف التكوين؟"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">إظهار</label> %s <label for=\"filter_categories\">عن</label> %s"
@@ -233,11 +231,11 @@ msgstr "<strong>لا</strong> دعني أؤكّد تحديثي بالبريد"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>لا</strong> دعني أسجّل دخولي بالبريد"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -248,7 +246,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>نعم</strong> لدي كلمة المرور"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -280,26 +278,29 @@ msgstr "إضافة هيئة"
 msgid "Add new category"
 msgstr "أضف تصنيفاً"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "إضافة مستخدم"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "اضف/عدل أولويات الاستجابة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "اضف/عدل قوالب الاستجابة"
 
@@ -307,7 +308,7 @@ msgstr "اضف/عدل قوالب الاستجابة"
 msgid "Added %s"
 msgstr "أُضيف %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -362,7 +363,7 @@ msgstr "تحديث أشار إلى أن هذه المشكلة تم حلها."
 msgid "Anonymous"
 msgstr "مجهول"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "مجهول:"
@@ -417,7 +418,7 @@ msgstr "تعيين إلى هيئة خارجية:"
 msgid "Assign to subdivision:"
 msgstr "تعيين إلى قسم فرعي:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -442,8 +443,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr "الإستجابة الآلية:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "التصنيفات المتاحة"
 
@@ -451,7 +452,7 @@ msgstr "التصنيفات المتاحة"
 msgid "Avoid personal information and vehicle number plates"
 msgstr "تفادى المعلومات الشخصية ولوحات السيارات"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "في إنتظار المشرفين"
@@ -464,12 +465,12 @@ msgstr "الخلف"
 msgid "Back to all reports"
 msgstr "عد إلى كل التقارير"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "حظر البريد الإلكتروني"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -500,10 +501,6 @@ msgstr "لا تستطيع العثور على رسالة البريد الإلك
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخطوة</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "إلغاء"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -516,7 +513,8 @@ msgstr "تصنيفات:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -536,7 +534,7 @@ msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -610,6 +608,10 @@ msgstr ""
 "اختر اسم <strong>تصنيف</strong> يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n"
 "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة."
 
+#: templates/web/base/report/_inspect.html:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -638,10 +640,11 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -743,8 +746,8 @@ msgstr "اتصل بفريق العمل"
 msgid "Coordinates:"
 msgstr "الإحداثيات:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "لم يتمكن من إيجاد المستخدم"
 
@@ -798,7 +801,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "إنشاء قالب"
@@ -839,7 +842,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "تم التعامل بواسطة القسم الفرعي في غضون 5 أيام عمل"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "حذف القالب"
@@ -905,21 +908,35 @@ msgstr "هل لديك كلمة مرور %s؟"
 msgid "Don&rsquo;t know"
 msgstr "لا أعلم"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "هل تحب النماذج؟"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "اسحب الصور واسقطها هنا أو <u>انقر للرفع</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "مكرر"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "مكرر"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "مكرر"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -931,7 +948,8 @@ msgstr ""
 "يمكن للتصنيفات المختلفة أن <strong>تمتلك نفس عنوان الاتصال</strong> (عنوان بريد إلكتروني).\n"
 "هذا يعني أنه يمكنك إضافة ما تشاء من التصنيفات حتى ولو كنت تملك عنوان اتصال واحد للجهة المسئولة."
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -950,11 +968,11 @@ msgstr "تعديل"
 msgid "Edit body details"
 msgstr "تعديل تفاصيل الجهة المسئولة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "عدل تفاصيل المستخدمين الآخرين"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "عدل صلاحيات المستخدمين الآخرين"
 
@@ -1005,7 +1023,7 @@ msgstr "المحرر"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "البريد أضيف إلى لائحة المسيئين"
 
@@ -1023,11 +1041,11 @@ msgstr "تم إنشاء الإخطار بالبريد"
 msgid "Email alert deleted"
 msgstr "تم حذف الإخطار بالبريد"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "البريد موجودا سابقا في لائحة المسيئين"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1101,7 +1119,7 @@ msgid "Enter details of the problem"
 msgstr "أدخل تفاصيل البلاغ"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1123,8 +1141,8 @@ msgstr "مثال لصندوق البريد %s"
 msgid "Examples:"
 msgstr "أمثلة:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "تصنيف موجود"
 
@@ -1160,7 +1178,8 @@ msgstr "فريق خارجي"
 msgid "Extra data:"
 msgstr "بيانات إضافية:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "تفاصيل إضافية"
 
@@ -1182,11 +1201,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "يمكن إصلاح ذلك عن طريق اختيار <strong>منطقة التغطية</strong> في نموذج <em>تحرير تفاصيل الهيئة</em> بالأسفل."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1194,12 +1214,12 @@ msgid "Fixed"
 msgstr "تم الإصلاح"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "تم الإصلاح - المجلس"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "تم الإصلاح - المستخدم"
 
@@ -1217,7 +1237,7 @@ msgstr "تم الإصلاح:"
 msgid "Flag as deleted"
 msgstr "مشار كمحذوف"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "مستخدم مشار إليه"
 
@@ -1238,7 +1258,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "مشار إليه:"
@@ -1276,7 +1296,7 @@ msgid "Frequently Asked Questions"
 msgstr "الأسئلة الشائعة"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "احصل على التحديثات"
 
@@ -1302,7 +1322,7 @@ msgstr "سعيد لسماع أنها أصلحت!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "اذهب"
@@ -1311,7 +1331,7 @@ msgstr "اذهب"
 msgid "Going to send questionnaire?"
 msgstr "هل تريد أن ترسل سؤال؟"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "إعطاء تصريح للأدمن"
 
@@ -1353,8 +1373,8 @@ msgstr "مرحبا %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1397,7 +1417,7 @@ msgstr "لقد أبلغت الآن عن مشكلة على @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "لقد حدثت الآن مشكلة على @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "نعتذر لك لم نستطع تحديد مشكلتك في قاعدة البيانات.\n"
 
@@ -1447,6 +1467,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1516,7 +1540,7 @@ msgstr "إضافة إلى ذلك، يتم إرجاع السمات التالية
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1552,7 +1576,7 @@ msgid "Internal notes"
 msgstr "ملاحظات داخلية"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "إحالة داخلية"
 
@@ -1560,7 +1584,7 @@ msgstr "إحالة داخلية"
 msgid "Invalid agency_responsible value %s"
 msgstr "قيمة agency_responsible غير صالحة %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "تاريخ نهاية غير صالح"
 
@@ -1568,16 +1592,16 @@ msgstr "تاريخ نهاية غير صالح"
 msgid "Invalid format %s specified."
 msgstr "التنسيق المحدد %s غير صالح."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "تاريخ البداية غير صالح"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1623,7 +1647,11 @@ msgstr "آخر تحديث"
 msgid "Last&nbsp;update:"
 msgstr "آخر تحديث:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1668,6 +1696,10 @@ msgstr "الخريطة"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "الخريطة"
@@ -1692,7 +1724,7 @@ msgstr "تحديد ما تم إصلاحه/إغلاقه منذ أكثر من ثم
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "الرسالة"
 
@@ -1712,7 +1744,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr " jurisdiction_id غير موجود"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1720,7 +1752,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1732,7 +1764,7 @@ msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل 
 msgid "Month"
 msgstr "الشهر"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "الأكثر تعليقا"
 
@@ -1756,7 +1788,7 @@ msgstr "الأكثر تعليقا"
 msgid "Name"
 msgstr "الاسم"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1768,7 +1800,7 @@ msgstr "الاسم:"
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1868,7 +1900,7 @@ msgstr "حالة جديدة"
 msgid "New template"
 msgstr "قالب جديد"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "الأحدث"
 
@@ -1883,7 +1915,7 @@ msgstr "التالي"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1904,7 +1936,7 @@ msgstr "لا هيئة"
 msgid "No council"
 msgstr "لا مجلس"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "لم يتم تحديد مجلس"
 
@@ -1970,7 +2002,7 @@ msgstr ""
 "                الأنشطة عبر الهيئة التي يمثلونها)، أو القدرة على إخفاء التقارير أو تعيين حالات خاصة للتقارير."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2048,15 +2080,15 @@ msgstr "المشكلات القديمة التي تم <br>إصلاحها"
 msgid "Older <br>problems"
 msgstr "المشكلات <br>القديمة"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "الأقدم"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2102,13 +2134,13 @@ msgstr "أو المشكلات المبلغ عنها إلى:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "أو يمكنك الاشتراك للحصول على تنبيه تبعًا للإدارة أو المجلس الذي تتبعه:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2129,7 +2161,7 @@ msgid "Parent"
 msgstr "العنصر الرئيسي"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "جزئي"
 
@@ -2163,7 +2195,7 @@ msgid "Phone number (optional)"
 msgstr "رقم الهاتف (اختياري)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2215,7 +2247,7 @@ msgstr "وضع دبوس على الخريطة"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2243,14 +2275,14 @@ msgid "Please check your email address is correct"
 msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "الرجاء اختيار فئة"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "الرجاء اختيار نوع العقار"
 
@@ -2274,13 +2306,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة استعمال المجلس يتسبب في تقليل قيمة الخدمة المقدمة لكل المستخدمين."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "الرجاء إدخال رسالة"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "الرجاء إدخال اسمك"
 
@@ -2295,13 +2327,13 @@ msgid "Please enter a password"
 msgstr "الرجاء إدخال كلمة مرور"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "الرجاء إدخال موضوع"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2314,7 +2346,7 @@ msgstr "الرجاء إدخال بريد إلكتروني صالح"
 msgid "Please enter a valid email address"
 msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "الرجاء إدخال بعض التفاصيل"
@@ -2347,8 +2379,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "الرجاء إدخال الاسم الكامل؛ فالمجالس تحتاج هذه المعلومة - إذا كنت لا ترغب في إظهار اسمك على الموقع، فألغِ تحديد هذا المربع الموجود بالأسفل"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2385,7 +2417,7 @@ msgstr "الرجاء تعبئة تفاصيل المشكلة."
 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 "الرجاء تعبئة النموذج التالي بتفاصيل المشكلة، وأدخل وصفًا للموقع يكون دقيقًا قدر الإمكان في مربع التفاصيل."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة في استبيان آخر أم لا"
 
@@ -2411,20 +2443,20 @@ msgstr "يرجى ملاحظة أن تحديثك <strong>لم يتم نشره ب
 msgid "Please note:"
 msgstr "الرجاء ملاحظة:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "الرجاء توضيح أسباب تقديم هذا التقرير"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "الرجاء إضافة بعض التوضيحات وصورة"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا"
 
@@ -2440,7 +2472,7 @@ msgstr "الرجاء تحديد الموجز الذي تريده"
 msgid "Please select the type of alert you want"
 msgstr "الرجاء تحديد نوع التنبيه الذي تريده"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم حلها أم لا"
 
@@ -2459,22 +2491,22 @@ msgstr "الرجاء كتابة رسالة"
 msgid "Please write your update here"
 msgstr "الرجاء كتابة التحديث هنا"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "نشر"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "نشر بدون تحديد الهوية في %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "تم النشر بواسطة %s (<strong>%s</strong>) في %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "تم النشر بواسطة %s في %s"
 
@@ -2490,7 +2522,8 @@ msgstr "السابق"
 msgid "Priorities"
 msgstr "أولويات"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "أولوية"
 
@@ -2506,10 +2539,15 @@ msgstr "الخصوصية وملفات تعريف الارتباط"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "خاص"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "تفاصيل إضافية"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "مشكلة"
@@ -2545,11 +2583,11 @@ msgstr "يتم تغيير حالة المشكلة حسب نتائج الاستط
 msgid "Problems"
 msgstr "المشكلات"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "المشكلات القريبة"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "المشكلات على الخريطة"
 
@@ -2561,7 +2599,7 @@ msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet
 msgid "Problems within %.1fkm of this location"
 msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2585,6 +2623,7 @@ msgstr "المشكلات ضمن حدود:"
 msgid "Property address:"
 msgstr "عنوان الملكية:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "قدّم تحديثًا"
@@ -2602,12 +2641,17 @@ msgstr "تقديم الاسم وكلمة المرور اختياري، ولكن
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "الاستجابة العامة:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "الاستجابة العامة:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2631,7 +2675,7 @@ msgstr "تمت الإجابة عن الاستبيان %d للمشكلة %d، م
 msgid "Questionnaire %d sent for problem %d"
 msgstr "تم إرسال الاستبيان %d للمشكلة %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن المشكلة"
 
@@ -2639,7 +2683,7 @@ msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن ا
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "موجز RSS"
 
@@ -2667,7 +2711,7 @@ msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s"
 msgid "RSS feed of nearby problems"
 msgstr "موجز RSS للمشكلات القريبة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2683,12 +2727,12 @@ msgid "RSS feed of recent local problems"
 msgstr "موجز RSS للمشكلات المحلية الحديثة"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "موجز RSS للتحديثات على هذه المشكلة"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "استلام بريد إلكتروني عند ترك تحديثات لهذه المشكلة."
 
@@ -2710,7 +2754,7 @@ msgstr "المشكلات التي تم <br>حلها مؤخرًا"
 msgid "Recently reported problems"
 msgstr "المشاكل المبلغة حديثا"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr "المحدثة مؤخرا"
 
@@ -2718,13 +2762,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "إزالة الإشارة"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2732,7 +2778,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr "احذف من الموقع"
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2746,7 +2792,8 @@ msgstr "رد على المستخدم:"
 msgid "Report"
 msgstr "إبلاغ"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "معرف البلاغ:"
 
@@ -2756,6 +2803,7 @@ msgstr "معرف البلاغ:"
 msgid "Report a problem"
 msgstr "الإبلاغ عن مشكلة"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "الإبلاغ عن إساءة"
@@ -2779,8 +2827,8 @@ msgstr "الإبلاغ عن المشكلة"
 msgid "Report, view, or discuss local problems"
 msgstr "الإبلاغ عن المشكلات المحلية أو عرضها أو مناقشتها"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
 
@@ -2789,8 +2837,8 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
 msgid "Reported before"
 msgstr "تم الإبلاغ عنها من قبل"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s في %s"
 
@@ -2803,27 +2851,27 @@ msgstr "تم الإبلاغ عنها بواسطة:"
 msgid "Reported in the %s category"
 msgstr "تم الإبلاغ عنها في الفئة %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "تم البلاغ في التصنيف %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بواسطة %s في %s"
 
@@ -2933,16 +2981,16 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتق
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "تدوير لليسار"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2953,21 +3001,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغييرات غير المحفوظة في التقرير."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "القمر الصناعي"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "عليه علامة تقرير مكرر"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "حفظ التغييرات"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -3004,6 +3057,10 @@ msgstr "لم يعثر البحث عن أي مستخدمين."
 msgid "See our privacy policy"
 msgstr "انظر سياسة الخصوصية"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3047,27 +3104,27 @@ msgstr "تم الإرسال:"
 msgid "Service:"
 msgstr "الخدمة:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr "اضبط إلى موقعي الحالي"
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "مشاركة"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3141,7 +3198,7 @@ msgstr "عذرًا، لم يكن هذا الارتباط صالحًا"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3189,12 +3246,14 @@ msgstr "تاريخ البداية:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "الحالة"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3234,7 +3293,7 @@ msgstr "الفئة الفرعية: %s"
 msgid "Subdivision/Body"
 msgstr "القسم الفرعي/الهيئة"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "الموضوع"
 
@@ -3251,7 +3310,7 @@ msgstr "الموضوع:"
 msgid "Submit"
 msgstr "تقديم"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3277,7 +3336,7 @@ msgid "Submitted"
 msgstr "تم  اضافتها"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "اشتراك"
 
@@ -3560,7 +3619,7 @@ msgstr "حدثت مشكلة أثناء عرض صفحة \"كل التقارير\"
 msgid "There was a problem showing this page. Please try again later."
 msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء إعادة المحاولة لاحقًا."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3652,9 +3711,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "هذه المعلومات مطلوبة"
@@ -3679,6 +3738,10 @@ msgstr "تم إصلاح هذه المشكلة"
 msgid "This problem has not been fixed"
 msgstr "لم يتم إصلاح هذه المشكلة"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3753,7 +3816,8 @@ msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذ
 msgid "Total"
 msgstr "الإجمالي"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr "هل يتطلب إدارة المرور؟"
 
@@ -3761,7 +3825,7 @@ msgstr "هل يتطلب إدارة المرور؟"
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3778,14 +3842,14 @@ msgid "Try emailing us directly:"
 msgstr "جرّب إرسال البريد الإلكتروني إلينا مباشرةً:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "يتعذر الإصلاح"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3805,8 +3869,8 @@ msgstr "غير معروف"
 msgid "Unknown alert type"
 msgstr "نوع تنبيه غير معروف"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "خطأ غير معروف"
@@ -3817,6 +3881,10 @@ msgstr "خطأ غير معروف"
 msgid "Unknown problem ID"
 msgstr "معرف المشكلة غير معروف"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "تحديث"
@@ -3870,7 +3938,7 @@ msgid "Updated"
 msgstr "تم التحديث"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3885,7 +3953,7 @@ msgstr "تم التحديث!"
 msgid "Updates"
 msgstr "التحديثات"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث"
 
@@ -3916,11 +3984,11 @@ msgstr "تم استخدام الخريطة"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "تمت إزالة إشارة المستخدم"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "تم وضع إشارة للمستخدم"
 
@@ -3929,7 +3997,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "عثر البحث الذي نفذه المستخدم على مطابقات في أسماء المستخدمين وعناوين البريد الإلكتروني."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4019,6 +4087,10 @@ msgstr "عند التحرير"
 msgid "When sent"
 msgstr "عند الإرسال"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4067,7 +4139,7 @@ msgstr "السنة"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4082,11 +4154,11 @@ msgstr "نعم"
 msgid "Yes I have a password"
 msgstr "نعم لدي كلمة المرور"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشراف دون ضرورة لذلك:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبل:"
 
@@ -4103,7 +4175,7 @@ msgstr "يمكنك <a href=\"%s%s\">عرض المشكلة على هذا المو
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "يمكنك التواصل مع الدعم الفني عبر <a href='mailto:%s'>%s</a>"
 
@@ -4200,9 +4272,9 @@ msgstr "حسابك"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4222,7 +4294,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "لن يتم استخدام معلوماتك إلا وفقًا <a href=\"/privacy\">لسياسة الخصوصية</a> الخاصة بنا"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4301,53 +4373,53 @@ msgstr "تحرير المستخدم"
 msgid "from %s different users"
 msgstr "من %s من المستخدمين المختلفين"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "آخر تحديث %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "أقل من دقيقة واحدة"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "عليه علامة تقرير مكرر"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "عليه علامة إجراء مجدول"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "عليه علامة إحالة داخلية"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "عليه علامة مغلق"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "عليه علامة تم الإصلاح"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "عليه علامة قيد التقدم"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "عليه علامة جارٍ التحقق"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "عليه علامة ليست مسؤولية المجلس"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "عليه علامة مخطط"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "عليه علامة يتعذر الإصلاح"
 
@@ -4393,8 +4465,8 @@ msgstr "المُدخل في الأصل: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "مناطق أخرى:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "تمت إعادة الفتح"
 
@@ -4440,18 +4512,18 @@ msgstr "المستخدم هو صاحب المشكلة"
 msgid "ward"
 msgstr "الإدارة"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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> تقرير مؤخرًا"
-msgstr[2] "<big>%s</big> من التقارير مؤخرًا"
-msgstr[3] "<big>%s</big> من التقارير مؤخرًا"
-msgstr[4] "<big>%s</big> من التقارير مؤخرًا"
-msgstr[5] "<big>%s</big> من التقارير مؤخرًا"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d يوم"
+msgstr[1] "%d يوم"
+msgstr[2] "%d من الأيام"
+msgstr[3] "%d من الأيام"
+msgstr[4] "%d من الأيام"
+msgstr[5] "%d من الأيام"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4462,18 +4534,7 @@ msgstr[3] "%d من الساعات"
 msgstr[4] "%d من الساعات"
 msgstr[5] "%d من الساعات"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d من الداعمين"
-msgstr[1] "%d داعم"
-msgstr[2] "%d من الداعمين"
-msgstr[3] "%d من الداعمين"
-msgstr[4] "%d من الداعمين"
-msgstr[5] "%d من الداعمين"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4484,29 +4545,18 @@ msgstr[3] "%d من الدقائق"
 msgstr[4] "%d من الدقائق"
 msgstr[5] "%d من الدقائق"
 
-#: 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] "<big>%s</big> تحديث على التقارير"
-msgstr[1] "<big>%s</big> تحديث على التقارير"
-msgstr[2] "<big>%s</big> من التحديثات على التقارير"
-msgstr[3] "<big>%s</big> من التحديثات على التقارير"
-msgstr[4] "<big>%s</big> من التحديثات على التقارير"
-msgstr[5] "<big>%s</big> من التحديثات على التقارير"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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[2] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
-msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
-msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
-msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d من الداعمين"
+msgstr[1] "%d داعم"
+msgstr[2] "%d من الداعمين"
+msgstr[3] "%d من الداعمين"
+msgstr[4] "%d من الداعمين"
+msgstr[5] "%d من الداعمين"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4517,6 +4567,17 @@ msgstr[3] "%d من الأسابيع"
 msgstr[4] "%d من الأسابيع"
 msgstr[5] "%d من الأسابيع"
 
+#: 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] "<big>%s</big> تقرير تم حله في الشهر الماضي"
+msgstr[1] "<big>%s</big> تقرير تم حله في الشهر الماضي"
+msgstr[2] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
+msgstr[3] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
+msgstr[4] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
+msgstr[5] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4528,27 +4589,27 @@ msgstr[3] "<big>%s</big> من التقارير في الأسبوع الماضي"
 msgstr[4] "<big>%s</big> من التقارير في الأسبوع الماضي"
 msgstr[5] "<big>%s</big> من التقارير في الأسبوع الماضي"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> تقرير تم حله في الشهر الماضي"
-msgstr[1] "<big>%s</big> تقرير تم حله في الشهر الماضي"
-msgstr[2] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
-msgstr[3] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
-msgstr[4] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
-msgstr[5] "<big>%s</big> من التقارير التي تم حلها في الشهر الماضي"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> تقرير مؤخرًا"
+msgstr[1] "<big>%s</big> تقرير مؤخرًا"
+msgstr[2] "<big>%s</big> من التقارير مؤخرًا"
+msgstr[3] "<big>%s</big> من التقارير مؤخرًا"
+msgstr[4] "<big>%s</big> من التقارير مؤخرًا"
+msgstr[5] "<big>%s</big> من التقارير مؤخرًا"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d يوم"
-msgstr[1] "%d يوم"
-msgstr[2] "%d من الأيام"
-msgstr[3] "%d من الأيام"
-msgstr[4] "%d من الأيام"
-msgstr[5] "%d من الأيام"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> تحديث على التقارير"
+msgstr[1] "<big>%s</big> تحديث على التقارير"
+msgstr[2] "<big>%s</big> من التحديثات على التقارير"
+msgstr[3] "<big>%s</big> من التحديثات على التقارير"
+msgstr[4] "<big>%s</big> من التحديثات على التقارير"
+msgstr[5] "<big>%s</big> من التحديثات على التقارير"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4560,3 +4621,17 @@ msgstr[2] "<strong>لا</strong> توجد لدينا تفاصيل عن المج
 msgstr[3] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 msgstr[4] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 msgstr[5] "<strong>لا</strong> توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+
+#: 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[2] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
+
+#~ msgid "Cancel"
+#~ msgstr "إلغاء"
diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0725b23a6..f40e25084 100644
--- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/bg_BG.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "и"
@@ -110,7 +110,7 @@ msgstr "%s квартал, %s"
 msgid "%s, within %s ward"
 msgstr "%s, в %s квартал"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Имейлът е маркиран като подаващ обидни сигнали)"
@@ -142,12 +142,10 @@ msgstr "(разстояние, което покрива грубо 7 500 жит
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(затворен)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(поправен)"
@@ -156,7 +154,7 @@ msgstr "(поправен)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(като графити, дупки по улицата, счупено улично осветление)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(не е изпратен към общината)"
 
@@ -164,21 +162,21 @@ msgstr "(не е изпратен към общината)"
 msgid "(optional)"
 msgstr "(незадължително)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(изпратен към двата района)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Изберете категория --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Изберете подходящ тип --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>Не</strong> Нека потвърдя актуализация
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Не</strong> Нека да вляза в системата чрез имейл"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Да</strong> Имам парола"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -265,26 +263,29 @@ msgstr "Добавете район"
 msgid "Add new category"
 msgstr "Добавяне на нова категория"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Добавете потребител"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -292,7 +293,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Добавено %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -347,7 +348,7 @@ msgstr "Този сигнал е маркиран като поправен."
 msgid "Anonymous"
 msgstr "Анонимен"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Анонимен:"
@@ -402,7 +403,7 @@ msgstr "Прехвърляне към външна община:"
 msgid "Assign to subdivision:"
 msgstr "Прехвърляне към подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -427,8 +428,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -436,7 +437,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Очакващ преглед"
@@ -449,12 +450,12 @@ msgstr "Назад"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Забрана на имейл адреса"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -485,10 +486,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Не виждате картата? <em>Пропуснете тази стъпка</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -501,7 +498,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -521,7 +519,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Сигнали подадени преди повече от 4 седмици"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -593,6 +591,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -621,10 +623,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -726,8 +729,8 @@ msgstr "Връзка с тима"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Потребителят не е намерен"
 
@@ -781,7 +784,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -822,7 +825,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -888,21 +891,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Не знам"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Не обичате форми?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Вече съществува"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Вече съществува"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Вече съществува"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -915,7 +932,8 @@ msgstr ""
 "(имейл адрес). Това означава, че можете да добавяте различни категории, \n"
 "дори и да имате само един контакт."
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -934,11 +952,11 @@ msgstr "Редактиране"
 msgid "Edit body details"
 msgstr "Редактиране на информацията за района"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -989,7 +1007,7 @@ msgstr "Редактирано от"
 msgid "Email"
 msgstr "Имейл"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Имейлът е добавен в списъка със злоупотреби"
 
@@ -1007,11 +1025,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Имейлът е в списъка със злоупотреби"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1078,7 +1096,7 @@ msgid "Enter details of the problem"
 msgstr "Въведете информация за проблема"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1100,8 +1118,8 @@ msgstr "Примерен пощенски адрес %s"
 msgid "Examples:"
 msgstr "Примери:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1137,7 +1155,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Допълнителни данни:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1159,11 +1178,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1171,12 +1191,12 @@ msgid "Fixed"
 msgstr "Поправено"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Поправени - община"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Поправени - потребител"
 
@@ -1194,7 +1214,7 @@ msgstr "Поправени:"
 msgid "Flag as deleted"
 msgstr "Означен като \"изтрит\""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Означаване на потребител"
 
@@ -1215,7 +1235,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Означен:"
@@ -1253,7 +1273,7 @@ msgid "Frequently Asked Questions"
 msgstr "Често задавани въпроси"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Изтегляне на актуализациите"
 
@@ -1279,7 +1299,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Търси"
@@ -1288,7 +1308,7 @@ msgstr "Търси"
 msgid "Going to send questionnaire?"
 msgstr "Ще изпратите ли анкетата?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1332,8 +1352,8 @@ msgstr "Здравей %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1376,7 +1396,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Вашият сигнал не беше намерен.\n"
 
@@ -1422,6 +1442,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1481,7 +1505,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1517,7 +1541,7 @@ msgid "Internal notes"
 msgstr "Вътрешни бележки"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Вътрешен номер"
 
@@ -1525,7 +1549,7 @@ msgstr "Вътрешен номер"
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Невярна дата"
 
@@ -1533,16 +1557,16 @@ msgstr "Невярна дата"
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Невярна дата"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1588,7 +1612,11 @@ msgstr "Последно обновено:"
 msgid "Last&nbsp;update:"
 msgstr "Последно обновено:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1633,6 +1661,10 @@ msgstr "Карта"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1657,7 +1689,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Съобщение"
 
@@ -1677,7 +1709,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Липсващо jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1685,7 +1717,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1697,7 +1729,7 @@ msgstr ""
 msgid "Month"
 msgstr "Месец"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1721,7 +1753,7 @@ msgstr ""
 msgid "Name"
 msgstr "Име"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1733,7 +1765,7 @@ msgstr "Име:"
 msgid "Name: %s"
 msgstr "Име: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1833,7 +1865,7 @@ msgstr "Ново състояние"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1848,7 +1880,7 @@ msgstr "Слеващ"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1869,7 +1901,7 @@ msgstr "Несъществуващ район"
 msgid "No council"
 msgstr "Несъществуваща община"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Не е избрана община"
 
@@ -1929,7 +1961,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2007,15 +2039,15 @@ msgstr "Поправени преди<br>известно време"
 msgid "Older <br>problems"
 msgstr "Стари <br>сигнали"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2061,13 +2093,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Или можете да се абонирате за всички известия на територията на София или само за района, в който се намирате."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2088,7 +2120,7 @@ msgid "Parent"
 msgstr "Община"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Частичен"
 
@@ -2122,7 +2154,7 @@ msgid "Phone number (optional)"
 msgstr "Телефонен номер (незадължително)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2174,7 +2206,7 @@ msgstr "Поставете кабърче върху картата"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2202,14 +2234,14 @@ msgid "Please check your email address is correct"
 msgstr "Моля проверете дали сте въвели коректен имейл адрес"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Моля изберете категория"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2230,13 +2262,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Моля не обиждайте никого - обиждайки Общината, Вие обезценявате услугата за всички потребители."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Моля въведете съобщение"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2251,13 +2283,13 @@ msgid "Please enter a password"
 msgstr "Моля въведете парола"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Моля въведете тема"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2270,7 +2302,7 @@ msgstr "Моля въведете валиден имейл"
 msgid "Please enter a valid email address"
 msgstr "Моля въведете валиден имейл адрес"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Моля въведете информация"
@@ -2303,8 +2335,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Моля въведете цялото си име, общината се нуждае от тази информация - ако не желаете името Ви да се появява на сайта, моля махнете отметката по-долу"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2341,7 +2373,7 @@ msgstr "Моля попълнете информация за проблема."
 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 "Моля попълнете формата с информация за проблема и опишете местоположението възможно най-точно."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Моля отбележете дали бихте искали да участвате в друга анкета"
 
@@ -2367,20 +2399,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Забележка:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Моля въведете информация защо отваряте сигнала отново."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Моля въведете информация и приложете снимка."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Моля отговорете дали някога сте подавали сигнал към общината преди."
 
@@ -2396,7 +2428,7 @@ msgstr "Моля изберете начин на известяване"
 msgid "Please select the type of alert you want"
 msgstr "Моля изберете тип известия, които бихте искали да получаваме"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Моля посочете дали проблемът е бил разрешен или не"
 
@@ -2415,22 +2447,22 @@ msgstr "Моля въведете съобщение"
 msgid "Please write your update here"
 msgstr "Моля въведете новото съобщение тук"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Публикувай"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Публикувано от анонимен потребител в %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Публикувано от %s (<strong>%s</strong>) в %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Публикувано от %s в %s"
 
@@ -2446,7 +2478,8 @@ msgstr "Предишно"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2462,10 +2495,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Лично"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Лично"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Сигнал"
@@ -2501,11 +2539,11 @@ msgstr "Статусът на сигнала е променен на основ
 msgid "Problems"
 msgstr "Сигнали"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Други сигнали наоколо"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Сигнали отбелязани върху картата"
 
@@ -2517,7 +2555,7 @@ msgstr "Проблеми сигнализирани скоро в сайта"
 msgid "Problems within %.1fkm of this location"
 msgstr "Сигнали в радиус от %.1fкм от това местоположение"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2541,6 +2579,7 @@ msgstr "Сигнали в границите на:"
 msgid "Property address:"
 msgstr "Адрес на имота:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Въведете иформация за актуализиране"
@@ -2558,12 +2597,17 @@ msgstr "Използването на потребителско име е оп
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Публичен отговор:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Публичен отговор:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2587,7 +2631,7 @@ msgstr "Анкетата %d е попълнена за проблем %d, %s д
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Анкетата  %d за проблем %d е изпратена"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Анкетата е попълнена от потребителя, подал сигнала"
 
@@ -2595,7 +2639,7 @@ msgstr "Анкетата е попълнена от потребителя, по
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS абонамент"
 
@@ -2623,7 +2667,7 @@ msgstr "RSS абонамент за %s, в квартал %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS абонамент за последни проблеми наоколо"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2639,12 +2683,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS абонамент за последни проблеми наоколо"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS абонамент за актуализации по този проблем"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Получаване на имейл при актуализация на проблема."
 
@@ -2666,7 +2710,7 @@ msgstr "Наскоро <br>поправени"
 msgid "Recently reported problems"
 msgstr "Наскоро добавени сигнали"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2674,13 +2718,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Премахване на означението"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2688,7 +2734,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2702,7 +2748,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2712,6 +2759,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Подайте сигнал"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Сигнализирай за неподходящо съдържание"
@@ -2735,8 +2783,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сигнализирай, разгледай или коментирай проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2745,8 +2793,8 @@ msgstr ""
 msgid "Reported before"
 msgstr "Подавал съм и преди"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2759,27 +2807,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сигналът е подаден в категория %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сигналът е подаден в категория %s от %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s"
 
@@ -2889,16 +2937,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Завъртане наляво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2909,21 +2957,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "маркиран като \"повторен\""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Запази промените"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2960,6 +3013,10 @@ msgstr "Не са намерени потребители."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3003,27 +3060,27 @@ msgstr "Изпратени:"
 msgid "Service:"
 msgstr "Услуга:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Сподели"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3095,7 +3152,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3143,12 +3200,14 @@ msgstr "Начална дата:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3188,7 +3247,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Тема"
 
@@ -3205,7 +3264,7 @@ msgstr "Тема:"
 msgid "Submit"
 msgstr "Изпращане"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3231,7 +3290,7 @@ msgid "Submitted"
 msgstr "Сигналът е потвърден"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Абониране"
 
@@ -3504,7 +3563,7 @@ msgstr "Възникна проблем при визуализирането н
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Възникна проблем при визуализирането на страницата. Моля пробвайте по-късно."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3586,9 +3645,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Тази информация е необходима"
@@ -3613,6 +3672,10 @@ msgstr "Този проблем е решен."
 msgid "This problem has not been fixed"
 msgstr "Този проблем не е решен."
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3687,7 +3750,8 @@ msgstr "За да видите точното местоположение на
 msgid "Total"
 msgstr "Общо"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3695,7 +3759,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3712,14 +3776,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3739,8 +3803,8 @@ msgstr "Неизвестен"
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Непозната грешка"
@@ -3751,6 +3815,10 @@ msgstr "Непозната грешка"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Актуализация"
@@ -3804,7 +3872,7 @@ msgid "Updated"
 msgstr "Актуализирано!"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3819,7 +3887,7 @@ msgstr "Актуализирано!"
 msgid "Updates"
 msgstr "Актуализации"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3850,11 +3918,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3863,7 +3931,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3953,6 +4021,10 @@ msgstr "Редактирано на:"
 msgid "When sent"
 msgstr "Изпратен"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4001,7 +4073,7 @@ msgstr "Година"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4016,11 +4088,11 @@ msgstr "Да"
 msgid "Yes I have a password"
 msgstr "Да, имам парола"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4037,7 +4109,7 @@ msgstr "Можете да <a href=\"%s%s\">разгледате сигнала 
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "За техническа поддръжка моля пишете ни на <a href='mailto:%s'>%s</a>"
 
@@ -4131,9 +4203,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4153,7 +4225,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Вашата информация ще бъде използва само спрямо нашата  <a href=\"/privacy\">Политика за поверителност</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4232,53 +4304,53 @@ msgstr "редакция на потребителя"
 msgid "from %s different users"
 msgstr "от %s различни потребители"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Последно обновено  %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "преди по-малко от минута"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "маркиран като \"повторен\""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "маркиран като \"започнато е действие\""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "маркиран като \"вътрешна референция\""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "маркиран като \"затворен\""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "маркиран като \"поправен\""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "маркиран като \"в процес на обработка\""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "маркиран като \"проучва се\""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "маркиран като \"незадължение на Общината\""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "маркиран като \"планиран\""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "марикарн като \"непоправим\""
 
@@ -4324,8 +4396,8 @@ msgstr "първоначално въведен: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "други територии:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "отново отворен"
 
@@ -4371,55 +4443,48 @@ msgstr "потребителят е собственик на сигнала"
 msgid "ward"
 msgstr "квартал"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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> подадени наскоро"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ден"
+msgstr[1] "%d дни"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часа"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d поддръжник"
-msgstr[1] "%d поддръжници"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минути"
 
-#: 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] "<big>%s</big>актуализиран сигнал"
-msgstr[1] "<big>%s</big>актуализирани сигнала"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Все още нямаме информация за общините, които стопанисват тази територия."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d поддръжник"
+msgstr[1] "%d поддръжници"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d седмица"
 msgstr[1] "%d седмици"
 
+#: 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] "<big>%s</big>поправени през изминалия месец"
+msgstr[1] "<big>%s</big>поправени през изминалия месец"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4427,19 +4492,19 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big>сигнал за изминалата седмица"
 msgstr[1] "<big>%s</big>сигнали за изминалата седмица"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big>поправени през изминалия месец"
-msgstr[1] "<big>%s</big>поправени през изминалия месец"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> подаден наскоро"
+msgstr[1] "<big>%s</big> подадени наскоро"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ден"
-msgstr[1] "%d дни"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big>актуализиран сигнал"
+msgstr[1] "<big>%s</big>актуализирани сигнала"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4447,3 +4512,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Все още <strong>нямаме</strong> информация за общината, която стопанисва тази територия."
 msgstr[1] "Все още <strong>нямаме</strong> информация за общините, които стопанисват тази територия."
+
+#: 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] "Все още нямаме информация за общините, които стопанисват тази територия."
diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
index ed75512c4..87e9d1b0e 100644
--- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " a "
@@ -110,7 +110,7 @@ msgstr "%s, oddělení, %"
 msgid "%s, within %s ward"
 msgstr "% S, v% s oddělení"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(E-mailů v tabulce zneužívání)"
@@ -142,12 +142,10 @@ msgstr "(Standardní vzdálenost, která pokrývá zhruba 10.000 lidí)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(uzavřené)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(vyřešeno)"
@@ -156,7 +154,7 @@ msgstr "(vyřešeno)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích a pod. )"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(není odesláno na úřad)"
 
@@ -164,21 +162,21 @@ msgstr "(není odesláno na úřad)"
 msgid "(optional)"
 msgstr "(volitelně)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(odesláno dvoum??)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Vyberte kategorii --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Vyberte typ nemovitosti --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -197,8 +195,8 @@ msgstr ""
 "              To je pravděpodobně proč je   \"area covered\" prázdná (níže).<br>\n"
 "             Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru."
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Ne</strong> Potvrdím aktualizaci e-mailem"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ne</strong> přihlásím se pomocí e-mailu"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ano</strong>  Mám heslo"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -268,26 +266,29 @@ msgstr "Zadejte instituci"
 msgid "Add new category"
 msgstr "Přidat novou kategorii"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Přidat Uživatele"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Přidáno %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -350,7 +351,7 @@ msgstr "Hlášení   bylo označeno za vyřešené."
 msgid "Anonymous"
 msgstr "Anonimní"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonymní:"
@@ -405,7 +406,7 @@ msgstr "Přiřaďte externí instituci:"
 msgid "Assign to subdivision:"
 msgstr "Přiřaďte oddělení:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -430,8 +431,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -439,7 +440,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Čeká se na moderování"
@@ -452,12 +453,12 @@ msgstr "Zpět"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Zakázat emailovou adresu"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -488,10 +489,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nevidíte mapu? <em>vynechte tento krok</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -504,7 +501,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -524,7 +522,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Category fix rate for problems > 4 týdny staré"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -599,6 +597,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -627,10 +629,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -732,8 +735,8 @@ msgstr "Kontaktujte nás!"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Uživatele nelze najít"
 
@@ -787,7 +790,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -828,7 +831,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Odbavované úřadem  do 5 pracovních dnů"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -894,21 +897,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Není známo"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Nechcete řešit formulářem?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicitní"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplicitní"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplicitní"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -917,7 +934,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -936,11 +954,11 @@ msgstr "Upravit"
 msgid "Edit body details"
 msgstr "Editace podrobností subjektu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -991,7 +1009,7 @@ msgstr "Úprava"
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "E-mail přidán do seznamu zneužívání"
 
@@ -1009,11 +1027,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-mail je již v seznamu zneužívání"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1080,7 +1098,7 @@ msgid "Enter details of the problem"
 msgstr "Uveďte podrobnosti daného problému"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1102,8 +1120,8 @@ msgstr "Příklad PSČ  %s"
 msgid "Examples:"
 msgstr "Příklady:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1139,7 +1157,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Doplňující data:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1161,11 +1180,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Pro opravu vyberte <strong>oblast pokrytí</strong> v části <em>Editace podrobností subjektu</em> ve formuláři níže."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1173,12 +1193,12 @@ msgid "Fixed"
 msgstr "Vyřešené"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "vyřešené - Úřad"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Vyřešené - Uživatel"
 
@@ -1196,7 +1216,7 @@ msgstr "Vyřešené:"
 msgid "Flag as deleted"
 msgstr "Označené za smazané"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Sledovat uživatele"
 
@@ -1217,7 +1237,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Sledováno:"
@@ -1255,7 +1275,7 @@ msgid "Frequently Asked Questions"
 msgstr "Často kladené dotazy"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Zasílání aktualizací"
 
@@ -1281,7 +1301,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "OK"
@@ -1290,7 +1310,7 @@ msgstr "OK"
 msgid "Going to send questionnaire?"
 msgstr "Odeslat dotazník?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1332,8 +1352,8 @@ msgstr "Přihlášená osoba: %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1376,7 +1396,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n"
 
@@ -1426,6 +1446,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1488,7 +1512,7 @@ msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open31
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1524,7 +1548,7 @@ msgid "Internal notes"
 msgstr "Interní poznámky"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Interní postoupení"
 
@@ -1532,7 +1556,7 @@ msgstr "Interní postoupení"
 msgid "Invalid agency_responsible value %s"
 msgstr "Chybná agency_responsible hodnota %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Chybný konečný datum"
 
@@ -1540,16 +1564,16 @@ msgstr "Chybný konečný datum"
 msgid "Invalid format %s specified."
 msgstr "Chybný formát %s specified."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Chybné počáteční datum"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1595,7 +1619,11 @@ msgstr "Poslední úpravy:"
 msgid "Last&nbsp;update:"
 msgstr "Poslední úpravy:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1640,6 +1668,10 @@ msgstr "MAPA"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Mapa"
@@ -1664,7 +1696,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Zpráva"
 
@@ -1684,7 +1716,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Chybějící jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1692,7 +1724,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1704,7 +1736,7 @@ msgstr "Moderováno oddělením během jednoho pracovního dne"
 msgid "Month"
 msgstr "Měsíc"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1728,7 +1760,7 @@ msgstr ""
 msgid "Name"
 msgstr "Jméno"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1740,7 +1772,7 @@ msgstr "Jméno:"
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1842,7 +1874,7 @@ msgstr "Nový stav"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1857,7 +1889,7 @@ msgstr "Další"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1878,7 +1910,7 @@ msgstr "Žádný subjekt"
 msgid "No council"
 msgstr "Žádný Úřad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Není vybrán žádný úřad"
 
@@ -1944,7 +1976,7 @@ msgstr ""
 "                aktivit jejich institucí), možnost smazat hlášení nebo nastavovat speciální stavy hlášení."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2022,15 +2054,15 @@ msgstr "Starší <br>vyřešené"
 msgid "Older <br>problems"
 msgstr "Starší <br>hlášení"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2076,13 +2108,13 @@ msgstr "Nebo problémy hlášené subjektu:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Nebo se můžete přihlásit k odběru všech upozornění na hlášení, které jsou v následujících oblastech úřadu či částí:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2103,7 +2135,7 @@ msgid "Parent"
 msgstr "Nadřazený subjekt"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Částečně"
 
@@ -2137,7 +2169,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonní číslo (volitelně)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2189,7 +2221,7 @@ msgstr "Umísti špendlík na mapu"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2217,14 +2249,14 @@ msgid "Please check your email address is correct"
 msgstr "Zkontrolujte, zda je vaše emailová adresa správná"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vyberte kategorii"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Zvolte typ nemovitosti"
 
@@ -2245,13 +2277,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "prosím zadejte zprávu"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2266,13 +2298,13 @@ msgid "Please enter a password"
 msgstr "Prosím zadejte heslo"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Prosím zadejte název"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2285,7 +2317,7 @@ msgstr "Prosím zadejte platný e-mail"
 msgid "Please enter a valid email address"
 msgstr "Prosím zadejte platnou emailovou adresu"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Prosím zadejte podrobnosti"
@@ -2318,8 +2350,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2356,7 +2388,7 @@ msgstr "Prosím, vyplňte údaje o hlášeném problému."
 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 "Vyplňte prosím níže uvedený formulář s údaji o problému, a popište místo tak přesně, jak je to možné v poli podrobnosti."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Uveďte, zda chcete dostat další dotazník"
 
@@ -2382,20 +2414,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Vezměte prosím na vědomí:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2411,7 +2443,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 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"
 
@@ -2430,22 +2462,22 @@ msgstr "Napište zprávu"
 msgid "Please write your update here"
 msgstr "Aktuální informace doplňte prosím zde"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Odeslat"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Odesláno uživatelem %s (<strong>%s</strong>) v %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Odesláno uživatelem  %s v %s"
 
@@ -2461,7 +2493,8 @@ msgstr "Předcházející"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2477,10 +2510,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Neveřejné"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Neveřejné"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Hlášení"
@@ -2516,11 +2554,11 @@ msgstr "Stav hlášení byl změněn na základě výsledků šetření"
 msgid "Problems"
 msgstr "Hlášení"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Hlášení v okolí"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Hlášení na mapě"
 
@@ -2532,7 +2570,7 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Hlášení v okolí %.1fkm od tohoto místa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2556,6 +2594,7 @@ msgstr "Hlášení uvnitř oblasti:"
 msgid "Property address:"
 msgstr "Adresa nemovitosti:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Poskytněte aktuální informace"
@@ -2573,12 +2612,17 @@ msgstr "Poskytnutí jména a hesla je volitelné, zato vám ale umožní snadně
 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í."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Veřejná reakce:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Veřejná reakce:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2602,7 +2646,7 @@ msgstr "Dotazník %d odpověděl na hlášení %d, %s to %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Dotazník %d poslal k hlášení %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému"
 
@@ -2610,7 +2654,7 @@ msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS kanál"
 
@@ -2638,7 +2682,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2654,12 +2698,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS kanál aktuálních lokálních hlášení"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS kanál aktualizací tohoto hlášení"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Dostávat e-mail, když je hlášení aktualizováno."
 
@@ -2681,7 +2725,7 @@ msgstr "Aktuálně <br>vyřešené"
 msgid "Recently reported problems"
 msgstr "Nedávno nahlášené problémy"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2689,13 +2733,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Odstranit příznak"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2703,7 +2749,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2717,7 +2763,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2727,6 +2774,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Nahlásit problém"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Nevhodný obsah"
@@ -2750,8 +2798,8 @@ msgstr "Nahlášení problému"
 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:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
 
@@ -2760,8 +2808,8 @@ msgstr "Nahlášeno anonymně v %s"
 msgid "Reported before"
 msgstr "Hlásil(a) jsem již dříve"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
 
@@ -2774,27 +2822,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Nahlášeno v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Nahlášeno anonymně v  %s v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Nahlášeno prostřednictvím %s anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 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:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 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"
 
@@ -2904,16 +2952,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2924,21 +2972,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satelitní"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "označené jako duplicitní hlášení"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2975,6 +3028,10 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3018,27 +3075,27 @@ msgstr "Odeslat:"
 msgid "Service:"
 msgstr "Služba:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Sdílet"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3110,7 +3167,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3158,12 +3215,14 @@ msgstr "Počáteční datum:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stav"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3203,7 +3262,7 @@ msgstr "Podkategorie: %s"
 msgid "Subdivision/Body"
 msgstr "Oddělení/Instituce"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Předmět"
 
@@ -3220,7 +3279,7 @@ msgstr "Předmět:"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3246,7 +3305,7 @@ msgid "Submitted"
 msgstr "Odesláno"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Přihlásit se k odběru"
 
@@ -3525,7 +3584,7 @@ msgstr "Nastal problém v zobrazení stránky Všechna hlášení. Prosím, zkus
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3617,9 +3676,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Tato informace je vyžadována"
@@ -3644,6 +3703,10 @@ msgstr "Hlášení bylo vyřešeno"
 msgid "This problem has not been fixed"
 msgstr "Hlášení nemohlo být vyřešeno"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3718,7 +3781,8 @@ msgstr "Pro  zobrazení mapy přesného umístění tohoto problému"
 msgid "Total"
 msgstr "Celkem"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3726,7 +3790,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3743,14 +3807,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Nelze opravit"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3770,8 +3834,8 @@ msgstr "Neznámé"
 msgid "Unknown alert type"
 msgstr "Neznámý typ upozornění"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Neznámá chyba"
@@ -3782,6 +3846,10 @@ msgstr "Neznámá chyba"
 msgid "Unknown problem ID"
 msgstr "Neznámé ID hlášení"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Aktualizovat"
@@ -3835,7 +3903,7 @@ msgid "Updated"
 msgstr "Aktualizováno"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3850,7 +3918,7 @@ msgstr "Aktualizováno!"
 msgid "Updates"
 msgstr "Aktualizace"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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"
 
@@ -3881,11 +3949,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Uživatel vyjmut ze sledování"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Uživatel sledován"
 
@@ -3894,7 +3962,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Při vyhledávání byly nalezeny shody  v uživatelských jménech nebo e-mailových adresách."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3984,6 +4052,10 @@ msgstr "Editováno:"
 msgid "When sent"
 msgstr "Odesláno:"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4032,7 +4104,7 @@ msgstr "Rok"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4047,11 +4119,11 @@ msgstr "Ano"
 msgid "Yes I have a password"
 msgstr "Ano mám heslo"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Stěžujete si, že toto hlášení bylo bezdůvodně moderováno:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Upozornění na níže uvedené hlášení, které může být urážlivé, obsahující osobní údaje či jiné nevhodné vyjádření."
 
@@ -4068,7 +4140,7 @@ msgstr "Můžete <a href=\"%s%s\">zobrazit hlášení na tomto webu</a>."
 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)."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Můžete kontaktovat technickou podporu <a href='mailto:%s'>%s</a>"
 
@@ -4164,9 +4236,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4186,7 +4258,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"/privacy\">zásadami ochrany osobních údajů</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4265,53 +4337,53 @@ msgstr "editace uživatele"
 msgid "from %s different users"
 msgstr "od %s různých uživatelů"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "naposledy upravené %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "méně než minutou"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "označené jako duplicitní hlášení"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "označené jako plánované"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "Označené jako interní postoupení"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "označeno za uzavřené"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "Označené jako vyřešené"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "označené jako probíhající"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "označené jako zkoumání"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "označené za nespadající do kompetencí úřadu"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "označené za naplánované"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "označené za nemožné spravit"
 
@@ -4357,8 +4429,8 @@ msgstr "původně zadáno: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "ostatní oblasti:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "znovu otevřeno"
 
@@ -4404,15 +4476,15 @@ msgstr "uživatel je vlastníkem hlášení"
 msgid "ward"
 msgstr "okrsek"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> aktuální hlášení"
-msgstr[1] "<big>%s</big> aktuální hlášení"
-msgstr[2] "<big>%s</big> aktuální hlášení"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d den"
+msgstr[1] "%d dny"
+msgstr[2] "%d dní"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4420,15 +4492,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d podporovatel"
-msgstr[1] "%d podporovatelé"
-msgstr[2] "%d podporovatelů"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4436,23 +4500,15 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
-#: 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] "<big>%s</big>aktualizované hlášení"
-msgstr[1] "<big>%s</big> aktalizovan hlášení"
-msgstr[2] "<big>%s</big> aktualizovaných hlášení"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu."
-msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
-msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d podporovatel"
+msgstr[1] "%d podporovatelé"
+msgstr[2] "%d podporovatelů"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4460,6 +4516,14 @@ msgstr[0] "%d týden"
 msgstr[1] "%d týdny"
 msgstr[2] "%d týdnů"
 
+#: 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] "<big>%s</big> vyřešeno poslední měsíc"
+msgstr[1] "<big>%s</big> vyřešeno poslední měsíc"
+msgstr[2] "<big>%s</big> vyřešeno poslední měsíc"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4468,21 +4532,21 @@ msgstr[0] "<big>%s</big> hlášení minulý týden"
 msgstr[1] "<big>%s</big> hlášení minulý týden"
 msgstr[2] "<big>%s</big> hlášení minulý týden"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> vyřešeno poslední měsíc"
-msgstr[1] "<big>%s</big> vyřešeno poslední měsíc"
-msgstr[2] "<big>%s</big> vyřešeno poslední měsíc"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> aktuální hlášení"
+msgstr[1] "<big>%s</big> aktuální hlášení"
+msgstr[2] "<big>%s</big> aktuální hlášení"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d den"
-msgstr[1] "%d dny"
-msgstr[2] "%d dní"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big>aktualizované hlášení"
+msgstr[1] "<big>%s</big> aktalizovan hlášení"
+msgstr[2] "<big>%s</big> aktualizovaných hlášení"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4491,3 +4555,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti  o dalším úřadě, který je za tuto oblast zodpovědný."
 msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti  o dalších úřadech, které jsou za tuto oblast zodpovědné."
 msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti  o dalších úřadech, které jsou za tuto oblast zodpovědné."
+
+#: 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] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu."
+msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
+msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
index 3c58dcb88..54e1dbbf6 100644
--- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cy.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "a"
@@ -110,7 +110,7 @@ msgstr "ward %s, %s"
 msgid "%s, within %s ward"
 msgstr "%s, o fewn ward %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
@@ -142,12 +142,10 @@ msgstr ""
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(ar gau)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(wedi trwsio)"
@@ -156,7 +154,7 @@ msgstr "(wedi trwsio)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(heb ei anfon at y cyngor)"
 
@@ -164,21 +162,21 @@ msgstr "(heb ei anfon at y cyngor)"
 msgid "(optional)"
 msgstr "(dewisol)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(anfonwyd i'r ddau)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Dewiswch gategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Dewiswch fath o eiddo --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bo
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Oes</strong>, mae gen i gyfrinair"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "Ychwanegu corff"
 msgid "Add new category"
 msgstr "Ychwanegu categori newydd"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Ychwanegwyd %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio."
 msgid "Anonymous"
 msgstr "Dienw"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Dienw:"
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr "Yn ôl"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Cysylltu â'r tîm"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Methu dod o hyd i'r defnyddiwr"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Lluosogi"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Lluosogi"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Lluosogi"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "Golygu"
 msgid "Edit body details"
 msgstr "Golygu manylion y corff"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "Golygydd"
 msgid "Email"
 msgstr "E-bost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd"
 
@@ -991,11 +1009,11 @@ msgstr "Crëwyd hysbysiad e-bost"
 msgid "Email alert deleted"
 msgstr "Dilëwyd hysbysiad e-bost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-bost eisoes yn y rhestr camddefnydd"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "Rhowch fanylion am y broblem"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "Cod post enghreifftiol %s"
 msgid "Examples:"
 msgstr "Enghraifft:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Data ychwanegol:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -1178,7 +1198,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "Cwestiynau a ofynnir yn aml"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Derbyn diweddariadau"
 
@@ -1263,7 +1283,7 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1272,7 +1292,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "Helo %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr "Dwi newydd adrodd problem ar @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr "Nodiadau mewnol"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Dyddiad dod i ben annilys"
 
@@ -1515,16 +1539,16 @@ msgstr "Dyddiad dod i ben annilys"
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Dyddiad cychwyn annilys"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "Diweddariad diwethaf:"
 msgid "Last&nbsp;update:"
 msgstr "Diweddariad&nbsp;diwethaf:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr "MAP"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Map"
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Neges"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id coll"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr ""
 msgid "Month"
 msgstr "Mis"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "Enw"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "Enw:"
 msgid "Name: %s"
 msgstr "Enw: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr "Nesaf"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr "Dim corff"
 msgid "No council"
 msgstr "Dim cyngor"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr ""
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr "Trwsiwyd <br>o'r blaen"
 msgid "Older <br>problems"
 msgstr "Problemau <br>hŷn"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr "Rhiant"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Rhannol"
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "Rhif ffôn (dewisol)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2212,13 +2244,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Rhowch neges"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "Rhowch gyfrinair"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Rhowch bwnc"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr "Rhowch e-bost dilys"
 msgid "Please enter a valid email address"
 msgstr "Rhowch gyfeiriad e-bost dilys"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Rhowch fanylion"
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr "Rhowch fanylion am y broblem."
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Noder:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Rhowch destun yn ogystal â llun"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2378,7 +2410,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Dywedwch a gafodd y broblem ei thrwsio"
 
@@ -2397,22 +2429,22 @@ msgstr "Ysgrifennwch neges"
 msgid "Please write your update here"
 msgstr "Ysgrifennwch eich diweddariad yma"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Postiwyd yn ddienw am %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Postiwyd gan %s (<strong>%s</strong>) am %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postiwyd gan %s am %s"
 
@@ -2428,7 +2460,8 @@ msgstr "Blaenorol"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Preifat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Preifat"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2483,11 +2521,11 @@ msgstr ""
 msgid "Problems"
 msgstr "Problemau"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemau gerllaw"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemau ar y map"
 
@@ -2499,7 +2537,7 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr "Problemau o fewn ffiniau:"
 msgid "Property address:"
 msgstr "Cyfeiriad yr eiddo:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Darparu diweddariad"
@@ -2540,12 +2579,17 @@ msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i ad
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Ymateb cyhoeddus:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Ymateb cyhoeddus:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2613,7 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2621,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Ffrwd RSS"
 
@@ -2605,7 +2649,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2665,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Ffrwd RSS o broblemau lleol diweddar"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon."
 
@@ -2648,7 +2692,7 @@ msgstr "Trwsiwyd yn <br>ddiweddar"
 msgid "Recently reported problems"
 msgstr "Problemau a adroddwyd yn ddiweddar"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2700,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2716,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2730,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2741,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Adrodd problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Adrodd camddefnydd"
@@ -2717,8 +2765,8 @@ msgstr "Adrodd eich problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Adrodd, gweld, neu drafod problemau lleol"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Adroddwyd yn ddienw am %s"
 
@@ -2727,8 +2775,8 @@ msgstr "Adroddwyd yn ddienw am %s"
 msgid "Reported before"
 msgstr "Adroddwyd eisoes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Adroddwyd gan %s am %s"
 
@@ -2741,27 +2789,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Adroddwyd yn y categori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 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:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Adroddwyd yn y categori %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Adroddwyd drwy %s yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Adroddwyd drwy %s gan %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Adroddwyd drwy %s yn y categori %s am %s"
 
@@ -2871,16 +2919,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Cylchdroi i'r chwith"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2939,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Cadw'r newidiadau"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2994,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3041,27 @@ msgstr "Anfonwyd:"
 msgid "Service:"
 msgstr "Gwasanaeth:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Rhannu"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3133,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3181,14 @@ msgstr "Dyddiad cychwyn:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Cyflwr"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3228,7 @@ msgstr "Is-gategori: %s"
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Pwnc"
 
@@ -3187,7 +3245,7 @@ msgstr "Pwnc:"
 msgid "Submit"
 msgstr "Cyflwyno"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3271,7 @@ msgid "Submitted"
 msgstr "Cyflwynwyd"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
@@ -3484,7 +3542,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3624,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Mae'r wybodaeth hon yn ofynnol"
@@ -3593,6 +3651,10 @@ msgstr "Trwsiwyd y broblem hon"
 msgid "This problem has not been fixed"
 msgstr "Ni thrwsiwyd y broblem hon"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3729,8 @@ msgstr ""
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3738,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3755,14 @@ msgid "Try emailing us directly:"
 msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Methu trwsio"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3782,8 @@ msgstr "Anhysbys"
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
@@ -3731,6 +3794,10 @@ msgstr "Gwall anhysbys"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3784,7 +3851,7 @@ msgid "Updated"
 msgstr "Diweddarwyd"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3866,7 @@ msgstr "Diweddarwyd!"
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3897,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3910,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +4000,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4052,7 @@ msgstr "Blwyddyn"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4067,11 @@ msgstr ""
 msgid "Yes I have a password"
 msgstr "Oes, mae gen i gyfrinair"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4088,7 @@ msgstr "Gallwch <a href=\"%s%s\">weld y broblem ar y wefan hon</a>."
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy <a href='mailto:%s'>%s</a>"
 
@@ -4108,9 +4179,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4201,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4280,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "diweddarwyd ddiwethaf %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "llai na munud"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4301,8 +4372,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "ardaloedd eraill:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "ailagorwyd"
 
@@ -4348,16 +4419,16 @@ msgstr ""
 msgid "ward"
 msgstr "ward"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d diwrnod"
+msgstr[1] "%d ddiwrnod"
+msgstr[2] "%d o ddiwrnodau"
+msgstr[3] "%d diwrnod"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4366,16 +4437,7 @@ msgstr[1] "%d awr"
 msgstr[2] "%d o oriau"
 msgstr[3] "%d awr"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d cefnogwr"
-msgstr[1] "%d gefnogwr"
-msgstr[2] "%d o gefnogwyr"
-msgstr[3] "%d cefnogwr"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4384,25 +4446,16 @@ msgstr[1] "%d funud"
 msgstr[2] "%d o funudau"
 msgstr[3] "%d munud"
 
-#: 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] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
-msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
-msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
-msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d cefnogwr"
+msgstr[1] "%d gefnogwr"
+msgstr[2] "%d o gefnogwyr"
+msgstr[3] "%d cefnogwr"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4411,6 +4464,15 @@ msgstr[1] "%d wythnos"
 msgstr[2] "%d o wythnosau"
 msgstr[3] "%d wythnos"
 
+#: 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] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4420,23 +4482,23 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d diwrnod"
-msgstr[1] "%d ddiwrnod"
-msgstr[2] "%d o ddiwrnodau"
-msgstr[3] "%d diwrnod"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4446,3 +4508,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
+
+#: 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] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
+msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
+msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
+msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn."
diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
index 28eb67ce4..ae8bc539e 100644
--- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/da_DK.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " og "
@@ -110,7 +110,7 @@ msgstr "%s bydel, %s"
 msgid "%s, within %s ward"
 msgstr "%s, indefor bydel %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsydere"
 
@@ -118,7 +118,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Epost i misbrugstabellen)"
@@ -142,12 +142,10 @@ msgstr "(en standardafstand som dækker en befolkning på omtrent 200.000)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(lukket)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(løst)"
@@ -156,7 +154,7 @@ msgstr "(løst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(ikke rapporteret til myndigheden)"
 
@@ -164,21 +162,21 @@ msgstr "(ikke rapporteret til myndigheden)"
 msgid "(optional)"
 msgstr "(valgfrit)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Vælg en kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Vælg en ejendomsstype --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jeg har en adgangskode"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "Tilføj myndighed"
 msgid "Add new category"
 msgstr "Tilføj ny kategori"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Tilføjede %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "En opdatering markerede dette problem som ordnet."
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym:"
@@ -399,7 +400,7 @@ msgstr "Tildel til ekstern myndighed:"
 msgid "Assign to subdivision:"
 msgstr "Tildelt underafdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Afventer moderation"
@@ -446,12 +447,12 @@ msgstr "Tilbage"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Bandlys epostadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ 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>."
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -590,6 +588,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -618,10 +620,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -723,8 +726,8 @@ msgstr "Kontakt projektgruppen"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kunne ikke finde bruger"
 
@@ -778,7 +781,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -819,7 +822,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Behandlet af underafdeling inden 5 arbejdsdage"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -885,21 +888,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Véd ikke"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Kan du ikke lide skemaer?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplikat"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplikat"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -911,7 +928,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -930,11 +948,11 @@ msgstr "Redigér"
 msgid "Edit body details"
 msgstr "Redigér detaljer for myndighed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -985,7 +1003,7 @@ msgstr "Opdateret af"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Epost lagt til misbrugsliste"
 
@@ -1003,11 +1021,11 @@ msgstr "Epostvarsel laget"
 msgid "Email alert deleted"
 msgstr "Epostvarsel slettet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Epost allerede i misbrugslisten"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1080,7 +1098,7 @@ msgid "Enter details of the problem"
 msgstr "Indtast detaljer om problemet"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1102,8 +1120,8 @@ msgstr "Eksempel-postnummer %s"
 msgid "Examples:"
 msgstr "Eksempler:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1139,7 +1157,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1161,11 +1180,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit body details</em>-skemaet nedenfor."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1173,12 +1193,12 @@ msgid "Fixed"
 msgstr "Løst"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Løst - Administration"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Løst - Bruger"
 
@@ -1196,7 +1216,7 @@ msgstr "Løst:"
 msgid "Flag as deleted"
 msgstr "Markér som slettet"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Markér bruger"
 
@@ -1217,7 +1237,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Markeret:"
@@ -1255,7 +1275,7 @@ msgid "Frequently Asked Questions"
 msgstr "Ofte spurgte spørgsmål"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Få opdateringer"
 
@@ -1281,7 +1301,7 @@ msgstr "Glad for at høre at det er i orden!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Søg"
@@ -1290,7 +1310,7 @@ msgstr "Søg"
 msgid "Going to send questionnaire?"
 msgstr "Skal der sendes spørgeskema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1332,8 +1352,8 @@ msgstr "Hej, %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1376,7 +1396,7 @@ msgstr "Jeg rapporterede netop et problem på @fixminvej"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Jeg opdaterede netop et problem på @fixminvej"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n"
 
@@ -1422,6 +1442,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1488,7 +1512,7 @@ msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-s
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1524,7 +1548,7 @@ msgid "Internal notes"
 msgstr "Interne notater"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Intern reference"
 
@@ -1532,7 +1556,7 @@ msgstr "Intern reference"
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-værdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ugyldig slut-dato"
 
@@ -1540,16 +1564,16 @@ msgstr "Ugyldig slut-dato"
 msgid "Invalid format %s specified."
 msgstr "Ugyldigt format %s angivet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1595,7 +1619,11 @@ msgstr "Sidste opdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Sidste&nbsp;opdatering:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1640,6 +1668,10 @@ msgstr "KORT"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Kort"
@@ -1664,7 +1696,7 @@ msgstr "Markeret som løst/lukket for mere end otte uger siden"
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Besked"
 
@@ -1684,7 +1716,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1692,7 +1724,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1704,7 +1736,7 @@ msgstr "Modereret af afdeling inden for en arbejdsdag"
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1728,7 +1760,7 @@ msgstr ""
 msgid "Name"
 msgstr "Navn"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1740,7 +1772,7 @@ msgstr "Navn:"
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1842,7 +1874,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1857,7 +1889,7 @@ msgstr "Næste"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1878,7 +1910,7 @@ msgstr "Ingen myndighed"
 msgid "No council"
 msgstr "Ingen myndighed"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ingen myndighed er valgt"
 
@@ -1945,7 +1977,7 @@ msgstr ""
 "aktivitet for hele instansen), mulighed at skjule beskeder eller sætte status for specialrapporter."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2023,15 +2055,15 @@ msgstr "Ældre <br>løste"
 msgid "Older <br>problems"
 msgstr "Ældre <br>problemer"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2077,13 +2109,13 @@ msgstr "Eller problemer meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnere på varsel baseret på bydel eller myndighed du hører ind under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2104,7 +2136,7 @@ msgid "Parent"
 msgstr "Forælder"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Delvis"
 
@@ -2138,7 +2170,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonnummer (valgfrit)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2190,7 +2222,7 @@ msgstr "Placér tegnestiften på kortet"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2218,14 +2250,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vælg en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Vælg en type egenskab"
 
@@ -2246,13 +2278,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Venligst indlæg en besked"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2267,13 +2299,13 @@ msgid "Please enter a password"
 msgstr "Indtast en adgangskode"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Venligst angiv et emne"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2286,7 +2318,7 @@ msgstr "Tilføj en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Angiv din e-post"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Angiv oplysninger om problemet"
@@ -2319,8 +2351,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2359,7 +2391,7 @@ msgstr ""
 "Venligst udfyld skemaet nedenfor med detaljerne om problemet,\n"
 "og beskriv placeringen så nøjagtigt som muligt i boksen for detaljer."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema"
 
@@ -2385,20 +2417,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Venligst bemærk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2414,7 +2446,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Venligs angiv om dette problem er blevet fikset eller ikke"
 
@@ -2433,22 +2465,22 @@ msgstr "Indtast en besked"
 msgid "Please write your update here"
 msgstr "Indtast venligst din opdatering her"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Indsend"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Publiceret anonymt %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Sendt ind af %s (<strong>%s</strong>) %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt ind af %s %s"
 
@@ -2464,7 +2496,8 @@ msgstr "Forrige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2480,10 +2513,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privat"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2519,11 +2557,11 @@ msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater"
 msgid "Problems"
 msgstr "Problemer"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemer i nærheden"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemer på kortet"
 
@@ -2535,7 +2573,7 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemer indenfor %.1fkm fra denne positionen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2559,6 +2597,7 @@ msgstr "Problemer indenfor grænserne af:"
 msgid "Property address:"
 msgstr "Ejendomsadresse:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Bidrag med en opdatering"
@@ -2576,12 +2615,17 @@ msgstr "Det er valgfrit at angive navn og adgangskode, men hvis du gør det kan
 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"
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Offentlig respons:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2605,7 +2649,7 @@ msgstr "Spørgeskema %d udfyldt for problem %d, %s til %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Spørgeskema %d sendt for problem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Spørgeskema udfyldt af fejlrapportøren"
 
@@ -2613,7 +2657,7 @@ msgstr "Spørgeskema udfyldt af fejlrapportøren"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
@@ -2641,7 +2685,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2657,12 +2701,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS-strøm med nylige lokale problemer"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-strøm med opdateringer for dette problem"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Modtag e-post når der er opdateringer på dette problem"
 
@@ -2684,7 +2728,7 @@ msgstr "Nyligt løste <br>problemer"
 msgid "Recently reported problems"
 msgstr "Nyligt meldte problemer"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2692,13 +2736,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Fjern markering"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2706,7 +2752,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2720,7 +2766,8 @@ msgstr ""
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2730,6 +2777,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Rapportér et problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Rapportér misbrug"
@@ -2753,8 +2801,8 @@ msgstr "Rapportér dit problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportér, find eller diskutér lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapporteret anonymt %s"
 
@@ -2763,8 +2811,8 @@ msgstr "Rapporteret anonymt %s"
 msgid "Reported before"
 msgstr "Rapporteret tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publiceret af %s %s"
 
@@ -2777,27 +2825,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Rapporteret i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapporteret i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporteret i kategorien %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Publiceret af %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporteret af %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporteret af %s i kategorien %s af %s %s"
 
@@ -2907,16 +2955,16 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotér til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2927,21 +2975,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satelit"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "markeret som duplikeret rapport"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2978,6 +3031,10 @@ msgstr "Søgningen fandt ingen brugere."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3021,27 +3078,27 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Tjeneste:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Del"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3116,7 +3173,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3164,12 +3221,14 @@ msgstr "Start-dato:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3209,7 +3268,7 @@ msgstr "Underkategori: %s"
 msgid "Subdivision/Body"
 msgstr "Underafdeling/myndighed"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Emne"
 
@@ -3226,7 +3285,7 @@ msgstr "Emne:"
 msgid "Submit"
 msgstr "Send ind"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3252,7 +3311,7 @@ msgid "Submitted"
 msgstr "Sendt ind"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Abonnér"
 
@@ -3539,7 +3598,7 @@ msgstr "Der var problemer med at vise 'Alle rapporter'-siden.  Venligst prøv ig
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3630,9 +3689,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Denne information er påkrævet"
@@ -3657,6 +3716,10 @@ msgstr "Dette problem er løst"
 msgid "This problem has not been fixed"
 msgstr "Dette problem er ikke blevet løst"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3731,7 +3794,8 @@ msgstr "For at se et kort med en mere præsis placering for dette problem."
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3739,7 +3803,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3756,14 +3820,14 @@ msgid "Try emailing us directly:"
 msgstr "Forsøg at sende epost direkte til os:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Kan ikke fikses"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3783,8 +3847,8 @@ msgstr "Ukendt"
 msgid "Unknown alert type"
 msgstr "Ukendt varsel-type"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Ukendt fejl"
@@ -3795,6 +3859,10 @@ msgstr "Ukendt fejl"
 msgid "Unknown problem ID"
 msgstr "Ukendt problem-Id"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Opdatering"
@@ -3848,7 +3916,7 @@ msgid "Updated"
 msgstr "Opdateret"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3863,7 +3931,7 @@ msgstr "Opdateret!"
 msgid "Updates"
 msgstr "Opdateringer"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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."
 
@@ -3894,11 +3962,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Brugermarkering fjernet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Bruger markeret"
 
@@ -3907,7 +3975,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Brugersøgning finder træf på brugernavne og epostadresser. "
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3997,6 +4065,10 @@ msgstr "Hvornår redigeret"
 msgid "When sent"
 msgstr "Hvornår sendt"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4045,7 +4117,7 @@ msgstr "År"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4060,11 +4132,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr "Ja, jeg har en adgangskode"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du klager over at denne problemrapport blev modereret uden grund:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:"
 
@@ -4081,7 +4153,7 @@ msgstr "Du kan <a href=\"%s%s\">læse om problemet på denne side</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Du kan kontakte teknisk support via <a href='mailto:%s'>%s</a>"
 
@@ -4176,9 +4248,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4198,7 +4270,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Vi vil kun bruge personlig information om dig i henhold til vores <a href=\"/faq#privacy\">privatlivsregler.</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4277,53 +4349,53 @@ msgstr "redigér bruger"
 msgid "from %s different users"
 msgstr "fra %s forskellige brugere"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "sidst opdateret %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "mindre end et minut"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "markeret som duplikeret rapport"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markeret som planlagt"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "markeret som en intern henvisning"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "markeret som lukket"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "markeret som fikset"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "markeret som under udførelse"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "markeret som undersøges"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markeret som ikke myndighedens ansvar"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "markeret som planlagt"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "markeret som uløseligt"
 
@@ -4369,8 +4441,8 @@ msgstr "oprinnelig lagt ind: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andre områder:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "åbnet igen"
 
@@ -4416,55 +4488,48 @@ msgstr "bruger er ejer af problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dage"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d supporter"
-msgstr[1] "%d supportere"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutter"
 
-#: 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] "<big>%s</big> rapport-<br>opdatering"
-msgstr[1] "<big>%s</big> rapport-<br>opdateringer"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted."
-msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d supporter"
+msgstr[1] "%d supportere"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uge"
 msgstr[1] "%d uger"
 
+#: 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] "<big>%s</big> fikset sidste måned"
+msgstr[1] "<big>%s</big> fikset sidste måned"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4472,19 +4537,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dage"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> rapport-<br>opdatering"
+msgstr[1] "<big>%s</big> rapport-<br>opdateringer"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4492,3 +4557,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted."
 msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted."
+
+#: 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted."
+msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted."
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index 30afe7f64..2c74eaf63 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "und"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr "(Schaden &amp; Ort des Schadens)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
@@ -142,12 +142,10 @@ msgstr ""
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(beantwortet)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(beantwortet)"
@@ -156,7 +154,7 @@ msgstr "(beantwortet)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr ""
 
@@ -164,21 +162,21 @@ msgstr ""
 msgid "(optional)"
 msgstr "(optional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Wählen Sie eine Kategorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Zeige</label> %s <label for=\"filter_categories\">&uuml;ber</label> %s"
@@ -218,11 +216,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "Neu Registrieren"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "Passwort"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "Adresse hinzuf&uuml;gen"
 msgid "Add new category"
 msgstr "F&uuml;ge neue Kategorie hinzu"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "User hinzuf&uuml;gen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr ""
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym"
@@ -399,7 +400,7 @@ msgstr "Nachricht an zuständige Stelle"
 msgid "Assign to subdivision:"
 msgstr "An Fachbereich zuweisen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Überprüfung ausstehend"
@@ -446,12 +447,12 @@ msgstr "Zur&uuml;ck"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr "Falls Sie kein E-Mail erhalten haben, &uuml;berpr&uuml;fen Sie bitte Ihr
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Karte nicht sichtbar? <em>&Uuml;berspringen Sie diesen Schritt</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr "Klicken Sie auf den Link im Best&auml;tigungsemail um sich anzumelden."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr "Koordinaten"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr ""
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Vorlage erstellen"
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Innerhalb von f&uuml;nf Arbeitstagen abgeschlossen"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Vorlage löschen"
@@ -876,21 +879,35 @@ msgstr "Haben Sie ein %s Passwort?"
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Fotos hierhin ziehen oder <u>hochladen</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplikat"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplikat"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "Anpassen"
 msgid "Edit body details"
 msgstr "Details editieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr ""
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -991,11 +1009,11 @@ msgstr "E-Mail Benachrichtigung erstellt"
 msgid "Email alert deleted"
 msgstr "E-Mail Benachrichtigung gel&ouml;scht"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "Beschreiben Sie den Schaden"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "Beispieladresse"
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr "Beantwortet"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -1178,7 +1198,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr "Als gel&#246;scht markieren"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "Hilfe"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr ""
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Los"
@@ -1272,7 +1292,7 @@ msgstr "Los"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "Hallo %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr "Interne Notizen"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ung&ultiges Enddatum"
 
@@ -1515,16 +1539,16 @@ msgstr "Ung&ultiges Enddatum"
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ung&ultiges Startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "Letzte Bearbeitung"
 msgid "Last&nbsp;update:"
 msgstr "Letzte Bearbeitung"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Nachricht"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr "Innerhalb eines Arbeitstages moderiert"
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "Name:"
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr "Neuer Status"
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr "Weiter"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr ""
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr "Geh&ouml;rt zu"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr ""
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonnummer (optional)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr "Pin auf der Karte absetzen"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre E-Mail Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Bitte w&auml;hlen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2212,13 +2244,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "Obligatorisches Feld"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Bitte geben Sie einige Details an"
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr "Beschreiben Sie den Schaden."
 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 "F&uuml;llen Sie das Formular mit den Details des Schadens aus und beschreiben Sie den Ort des Schadens m&ouml;glichst genau."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2378,7 +2410,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -2397,22 +2429,22 @@ msgstr ""
 msgid "Please write your update here"
 msgstr ""
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -2428,7 +2460,8 @@ msgstr "Zur&uuml;ck"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr ""
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Details editieren"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Meldung"
@@ -2483,11 +2521,11 @@ msgstr ""
 msgid "Problems"
 msgstr "Meldungen"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Meldungen in der N&auml;he"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Meldungen auf der Karte"
 
@@ -2499,7 +2537,7 @@ msgstr "Meldungen, welche k&uuml;rzlich beantwortet wurden"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Meldung aktualisieren"
@@ -2540,12 +2579,17 @@ msgstr ""
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "R&uuml;ckmeldung an User"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "R&uuml;ckmeldung an User"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2613,7 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2621,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr ""
 
@@ -2605,7 +2649,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2665,12 @@ msgid "RSS feed of recent local problems"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
 
@@ -2648,7 +2692,7 @@ msgstr "K&uuml;rzlich <br>beantwortet"
 msgid "Recently reported problems"
 msgstr "K&uuml;rzlich erfasste Meldungen:"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2700,15 @@ 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 "&#171;Z&uuml;ri wie neu&#187; dient dazu Sch&auml;den an der Infrastruktur zu melden. Meldungen und W&uuml;nsche bez&uuml;glich Verbesserungen an der Infrastruktur sowie Gestaltungsvorschl&auml;ge k&ouml;nnen über &#171;Z&uuml;ri wie neu&#187; nicht ber&uuml;cksichtigt werden. Notf&auml;lle m&uuml;ssen der Polizei gemeldet werden via Telefon 117."
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2716,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2730,8 @@ msgstr "Antwort an User"
 msgid "Report"
 msgstr "Meldung"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2741,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Eine Meldung erfassen"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Missbrauch melden"
@@ -2717,8 +2765,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Melden Sie Sch&auml;den an der Infrastruktur von Z&uuml;rich"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
 
@@ -2727,8 +2775,8 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
@@ -2741,27 +2789,27 @@ msgstr "Gemeldet von"
 msgid "Reported in the %s category"
 msgstr "In der Kategorie %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "In der Kategorie %s um %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2871,16 +2919,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2939,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Speichern"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2994,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3041,27 @@ msgstr "Gesendet:"
 msgid "Service:"
 msgstr "Gerät"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3133,7 @@ msgstr "Entschuldigung, dieser Link ist ung&uuml;ltig"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3181,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3228,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr "FB/Externe"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Titel"
 
@@ -3187,7 +3245,7 @@ msgstr "Titel"
 msgid "Submit"
 msgstr "Abschicken"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3271,7 @@ msgid "Submitted"
 msgstr "Erfasst"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3484,7 +3542,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3624,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Diese Information wird ben&ouml;tigt"
@@ -3593,6 +3651,10 @@ msgstr "Dieser Schaden wurde behoben"
 msgid "This problem has not been fixed"
 msgstr "Dieser Schaden wurde nicht behoben"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3729,8 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3738,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3755,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3782,8 @@ msgstr "Unbekannt"
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -3731,6 +3794,10 @@ msgstr "Unbekannter Fehler"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Speichern"
@@ -3784,7 +3851,7 @@ msgid "Updated"
 msgstr "Aktualisiert"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3866,7 @@ msgstr "Aktualisiert!"
 msgid "Updates"
 msgstr "Antwort"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3897,11 @@ msgstr "Karte verwendet"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3910,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +4000,10 @@ msgstr "Wann editiert"
 msgid "When sent"
 msgstr "Wann gesendet"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4052,7 @@ msgstr "Jahr"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4067,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4088,7 @@ msgstr "Danke! Sie k&ouml;nnen Ihre aktualisierte Meldung <a href=\"%s%s\">auf d
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4108,9 +4179,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4201,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4280,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr "von %s verschiedenen Personen"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "letzte Bearbeitung %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "als beantwortet markiert"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4301,8 +4372,8 @@ msgstr "Originaltext: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -4348,55 +4419,48 @@ msgstr "Der User ist der Eigner der Meldung"
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] ""
-msgstr[1] ""
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: 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] "<big>%s</big> Meldung bearbeitet"
-msgstr[1] "<big>%s</big> Meldungen bearbeitet"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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."
+msgid "%d supporter"
+msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
+#: 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] "<big>%s</big> bearbeitete Meldung im letzten Monat"
+msgstr[1] "<big>%s</big> bearbeitete Meldungen im letzten Monat"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4404,19 +4468,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> Meldung bearbeitet"
+msgstr[1] "<big>%s</big> Meldungen bearbeitet"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4424,3 +4488,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index f2de680b8..a76a894c3 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2016\n"
 "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "und"
@@ -110,7 +110,7 @@ msgstr "%s Stadtteil, %s"
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>-Beitragende"
 
@@ -118,7 +118,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
@@ -142,12 +142,10 @@ msgstr ""
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(geschlossen)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(gel&ouml;st)"
@@ -156,7 +154,7 @@ msgstr "(gel&ouml;st)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr ""
 
@@ -164,21 +162,21 @@ msgstr ""
 msgid "(optional)"
 msgstr "(optional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(gesendet an beide)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- W&auml;hlen Sie eine Kategorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Wählen Sie eine Eigentumsart --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Wählen Sie eine Vorlage aus--"
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, ich habe ein Passwort"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr ""
 msgid "Add new category"
 msgstr "F&uuml;ge neue Kategorie hinzu"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "%s hinzugefügt"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym:"
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Wartet auf Moderation"
@@ -446,12 +447,12 @@ msgstr "Zurück"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Kontaktieren Sie das Team"
 msgid "Coordinates:"
 msgstr "Koordinaten:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Benutzer konnte nicht gefunden werden"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Vorlage erstellen"
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Vorlage löschen"
@@ -876,21 +879,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Weiß ich nicht"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Sie mögen keine Formulare?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplizieren"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplizieren"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplizieren"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "Bearbeiten"
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -991,11 +1009,11 @@ msgstr "E-Mail-Benachrichtigung erstellt"
 msgid "Email alert deleted"
 msgstr "E-Mail-Benachrichtigung gelöscht"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "Beschreiben sie den Mangel"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "Beispieladresse"
 msgid "Examples:"
 msgstr "Beispiele:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Zusätzliche Daten:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr "Gel&ouml;st"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -1178,7 +1198,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "Häufig gestellte Fragen"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Aktualisierungen holen"
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Los"
@@ -1272,7 +1292,7 @@ msgstr "Los"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "Hallo %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr "Interne Hinweise"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ung&ultiges Enddatum"
 
@@ -1515,16 +1539,16 @@ msgstr "Ung&ultiges Enddatum"
 msgid "Invalid format %s specified."
 msgstr "Ungültiges Format %s angegeben."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ung&ultiges Startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "Letzte Bearbeitung"
 msgid "Last&nbsp;update:"
 msgstr "Letzte&nbsp;Aktualisierung:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr "KARTE"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Karte"
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Nachricht"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Fehlendes jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr ""
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "Name:"
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr "Neuer Status"
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr "Weiter"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr ""
 msgid "No council"
 msgstr "Kein Rat"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Kein Rat ausgewählt"
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr "Ältere <br>Probleme"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr "Übergeordnet"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Teilweise"
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonnummer (optional)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr "Stecknadel auf Karte platzieren"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre eMail-Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Bitte w&auml;hlen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Bitte wählen Sie eine Eigentumsart"
 
@@ -2212,13 +2244,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Bitte geben Sie eine Nachricht ein"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Bitte geben Sie Ihren Namen ein"
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "Bitte geben Sie ein Passwort ein"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Bitte geben Sie einen Betreff ein"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Bitte geben Sie einiges Details an"
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr ""
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2378,7 +2410,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -2397,22 +2429,22 @@ msgstr "Bitte schreiben Sie eine Nachricht"
 msgid "Please write your update here"
 msgstr "Bitte schreiben Sie hier Ihre Aktualisierung"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -2428,7 +2460,8 @@ msgstr "Vorherige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr "Datenschutz und Cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privat"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Meldung"
@@ -2483,11 +2521,11 @@ msgstr ""
 msgid "Problems"
 msgstr "Meldungen"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Meldungen in der N&auml;he"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Meldungen auf der Karte"
 
@@ -2499,7 +2537,7 @@ msgstr "Meldungen, welche k&uuml;rzlich gel&ouml;st wurden"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr "Probleme innerhalb der Grenze von:"
 msgid "Property address:"
 msgstr "Immobilien-Adresse:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Meldung aktualisieren"
@@ -2540,12 +2579,16 @@ msgstr ""
 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_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2612,7 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2620,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-Feed"
 
@@ -2605,7 +2648,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2664,12 @@ msgid "RSS feed of recent local problems"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
 
@@ -2648,7 +2691,7 @@ msgstr "Kürzlich <br>repariert"
 msgid "Recently reported problems"
 msgstr "K&uuml;rzlich erfasste Meldungen"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2699,15 @@ 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 "Fix My Z&uuml;rich wird prim&auml;r daf&uuml;r verwendet, physische M&auml;ngel zu melden, welche behoben werden k&ouml;nnen. Wenn Ihr Problem daf&uuml;r nicht passend erscheint, k&ouml;nnen sie die entsprechende Dienststelle weiterhin telefonisch oder per eMail erreichen."
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2715,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2729,8 @@ msgstr ""
 msgid "Report"
 msgstr "Bericht"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2740,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Eine Meldung erfassen"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Missbrauch melden"
@@ -2717,8 +2764,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Melden sie M&auml;ngel an der Infrastruktur von Z&uuml;rich"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
 
@@ -2727,8 +2774,8 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr "Vorher berichtet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
@@ -2741,27 +2788,27 @@ msgstr "Gemeldet von:"
 msgid "Reported in the %s category"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
@@ -2871,16 +2918,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2938,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satellit"
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "&Auml;nderungen speichern"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2993,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3040,27 @@ msgstr "Gesendet:"
 msgid "Service:"
 msgstr "Dienst:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Teilen"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3132,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3180,14 @@ msgstr "Startdatum:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3227,7 @@ msgstr "Unterkategorie: %s"
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Titel"
 
@@ -3187,7 +3244,7 @@ msgstr "Titel:"
 msgid "Submit"
 msgstr "Abschicken"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3270,7 @@ msgid "Submitted"
 msgstr "Gesendet"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -3484,7 +3541,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3623,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Diese Information wird ben&ouml;tigt"
@@ -3593,6 +3650,10 @@ msgstr "Dieser Mangel wurde behoben"
 msgid "This problem has not been fixed"
 msgstr "Dieser Mangel wurde nicht behoben"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3728,8 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3737,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3754,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Kann nicht behoben werden"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3781,8 @@ msgstr "Unbekannt"
 msgid "Unknown alert type"
 msgstr "Unbekannter Benachrichtigungstyp"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -3731,6 +3793,10 @@ msgstr "Unbekannter Fehler"
 msgid "Unknown problem ID"
 msgstr "Unbekannte Problemkennung"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Beschreibung"
@@ -3784,7 +3850,7 @@ msgid "Updated"
 msgstr "Aktualisiert"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3865,7 @@ msgstr "Aktualisiert!"
 msgid "Updates"
 msgstr "Aktualisierungen"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3896,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3909,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +3999,10 @@ msgstr "Wann editiert"
 msgid "When sent"
 msgstr "Wann gesendet"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4051,7 @@ msgstr "Jahr"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4066,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr "Ja, ich habe ein Passwort"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4087,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4108,9 +4178,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4200,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4279,53 @@ msgstr "Benutzer bearbeiten"
 msgid "from %s different users"
 msgstr "von %s verschiedenen Benutzern"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "zuletzt aktualisiert %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "als Aktion geplant markiert"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "als geschlossen markiert"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "als gel&ouml;st markiert"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "als in Bearbeitung markiert"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "als untersuchend markiert"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "als geplant markiert"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4301,8 +4371,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "andere Gebiete:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "erneut geöffnet"
 
@@ -4348,55 +4418,48 @@ msgstr "Benutzer ist Problemeigentümer"
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d Unterstützer"
-msgstr[1] "%d Unterstützer"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: 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] "<big>%s</big> Meldung bearbeitet"
-msgstr[1] "<big>%s</big> Meldungen bearbeitet"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] ""
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d Unterstützer"
+msgstr[1] "%d Unterstützer"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
+#: 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] "<big>%s</big> im letzten Monat behoben"
+msgstr[1] "<big>%s</big> im letzten Monat gehoben"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4404,19 +4467,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] ""
+msgstr[1] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> Meldung bearbeitet"
+msgstr[1] "<big>%s</big> Meldungen bearbeitet"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4424,3 +4487,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
index c98d5db3a..0e97e216c 100644
--- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/el_GR.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "και"
@@ -124,7 +124,7 @@ msgstr "%s περιοχή, %s"
 msgid "%s, within %s ward"
 msgstr "%s, στην περιοχή %quot;%s&quot;"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> και συνεργάτες"
 
@@ -132,7 +132,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Ελλάτωμα &amp; τοποθεσία ελλατώματος)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(το email βρίσκεται στη μαύρη λίστα)"
@@ -156,12 +156,10 @@ msgstr "(αντιστοιχεί σε περιοχή όπου κατοικούν
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(εναλλακτικά, μπορείς να λαμβάνεις ειδοποιήσεις για ζητήματα σε ακτίνα %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(έκλεισε)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(διορθώθηκε)"
@@ -170,7 +168,7 @@ msgstr "(διορθώθηκε)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένες πλάκες πεζοδρομίου ή καμένα φώτα δρόμων)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(δεν αποστάλθηκε σε υπηρεσία)"
 
@@ -178,21 +176,21 @@ msgstr "(δεν αποστάλθηκε σε υπηρεσία)"
 msgid "(optional)"
 msgstr "(προαιρετικό)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(στάλθηκε και στις δύο)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Διάλεξε κατηγορία --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Διάλεξε είδος ακινήτου --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -211,8 +209,8 @@ msgstr ""
 "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).<br>\n"
 "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Προβολή</label> %s <label for=\"filter_categories\">σχετικά με</label> %s"
@@ -235,11 +233,11 @@ msgstr "<strong>Όχι</strong> Να γίνει επιβεβαίωση της ε
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Όχι</strong> να συνδεθώ μέσω email"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -250,7 +248,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ναι</strong> έχω κωδικό πρόσβασης"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -281,26 +279,29 @@ msgstr "Προσθήκη τομέα"
 msgid "Add new category"
 msgstr "Προσθήκη νέας κατηγορίας"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Προσθήκη χρήστη"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -308,7 +309,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Προστέθηκε %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -363,7 +364,7 @@ msgstr "Το πρόβλημα ενημερώθηκε ως διορθωμένο."
 msgid "Anonymous"
 msgstr "Ανώνυμος"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Ανώνυμος:"
@@ -418,7 +419,7 @@ msgstr "Ανάθεση σε εξωτερικό τομέα:"
 msgid "Assign to subdivision:"
 msgstr "Ανάθεση στο τμήμα:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -443,8 +444,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -452,7 +453,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Σε αναμονή ελέγχου"
@@ -465,12 +466,12 @@ msgstr "Πίσω"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Αποκλεισμός της διεύθυνσης email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -501,10 +502,6 @@ msgstr "Δεν μπορείς να βρεις το email μας; Έλεγξε τ
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Δεν μπορείς να δεις τον χάρτη; <em>Παράλειψη βήματος</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -517,7 +514,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -537,7 +535,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -609,6 +607,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -637,10 +639,11 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -742,8 +745,8 @@ msgstr "Επικοινώνησε με την ομάδα διαχείρισης"
 msgid "Coordinates:"
 msgstr "Συντεταγμένες:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Δεν είναι δυνατή η εύρεση χρήστη"
 
@@ -797,7 +800,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Δημιουργία προτύπου"
@@ -838,7 +841,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσιμες ημέρες"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Διαγραφή προτύπου"
@@ -904,21 +907,35 @@ msgstr "Έχεις κωδικό πρόσβασης %s?"
 msgid "Don&rsquo;t know"
 msgstr "Δεν γνωρίζω"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Δεν σου αρέσουν οι φόρμες;"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Σύρε φωτογραφίες εδώ ή <u>κάνε κλικ για ανέβασμα</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Διπλότυπο"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Διπλότυπο"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Διπλότυπο"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -930,7 +947,8 @@ msgstr ""
 "Διαφορετικές κατηγορίες <strong>μπορούν να ανήκουν στην ίδια επαφή</strong> (διεύθυνση email).\n"
 "Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα."
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -949,11 +967,11 @@ msgstr "Επεξεργασία"
 msgid "Edit body details"
 msgstr "Επεξεργασία λεπτομερειών του τομέα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -1004,7 +1022,7 @@ msgstr "Επεξεργαστής"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Το Email προστέθηκε στην μαύρη λίστα"
 
@@ -1022,11 +1040,11 @@ msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε"
 msgid "Email alert deleted"
 msgstr "Η ειδοποίηση μέσω email διεγράφη"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Το Email είναι ήδη στην μαύρη λίστα"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1100,7 +1118,7 @@ msgid "Enter details of the problem"
 msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλημα"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1122,8 +1140,8 @@ msgstr "Παράδειγμα ταχυδρομικού κώδικα %s"
 msgid "Examples:"
 msgstr "Παραδείγματα:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1159,7 +1177,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Επιπλέον δεδομένα:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Διόρθωσέ το επιλέγοντας μία <strong>περιοχή αρμοδιότητας</strong> στη φόρμα <em>Επεξεργασία λεπτομερειών του σώματος</em> παρακάτω."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1193,12 +1213,12 @@ msgid "Fixed"
 msgstr "Διορθώθηκε"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Διορθώθηκε - Υπηρεσία"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Διορθώθηκε - Χρήστης"
 
@@ -1216,7 +1236,7 @@ msgstr "Διορθώθηκε:"
 msgid "Flag as deleted"
 msgstr "Σήμανση ως διαγραμμένο"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Επισήμανση χρήστη"
 
@@ -1237,7 +1257,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Επισημασμένοι:"
@@ -1275,7 +1295,7 @@ msgid "Frequently Asked Questions"
 msgstr "Συχνές Ερωτήσεις"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Λήψη ενημερώσεων"
 
@@ -1301,7 +1321,7 @@ msgstr "Χαιρόμαστε που φτιάχτηκε!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Εμπρός"
@@ -1310,7 +1330,7 @@ msgstr "Εμπρός"
 msgid "Going to send questionnaire?"
 msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1352,8 +1372,8 @@ msgstr "Γεια %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1396,7 +1416,7 @@ msgstr "Μόλις ανέφερα ένα πρόβλημα στο @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Μόλις ενημέρωσα ένα πρόβλημα στο @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Δεν μπορέσαμε να εντοπίσουμε το πρόβλημά σου στην βάση δεδομένων.\n"
 
@@ -1444,6 +1464,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1505,7 +1529,7 @@ msgstr "Επιπλέον, θα επιστραφούν οι παρακάτω ιδ
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1541,7 +1565,7 @@ msgid "Internal notes"
 msgstr "Εσωτερικές οδηγίες"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Εσωτερική αναφορά"
 
@@ -1549,7 +1573,7 @@ msgstr "Εσωτερική αναφορά"
 msgid "Invalid agency_responsible value %s"
 msgstr "Εσφαλμένη τιμή agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Λανθασμένη ημερομηνία λήξης"
 
@@ -1557,16 +1581,16 @@ msgstr "Λανθασμένη ημερομηνία λήξης"
 msgid "Invalid format %s specified."
 msgstr "Λανθασμένη μορφοποίηση %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Λανθασμένη ημερομηνία έναρξης"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1612,7 +1636,11 @@ msgstr "Τελευταία ενημέρωση"
 msgid "Last&nbsp;update:"
 msgstr "Τελευταία&nbsp;ενημέρωση:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1657,6 +1685,10 @@ msgstr "ΧΑΡΤΗΣ"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Χάρτης"
@@ -1681,7 +1713,7 @@ msgstr "Σημείωση ως επιδιορθωμένο/κλειστό πιο 
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Μήνυμα"
 
@@ -1701,7 +1733,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Λείπει το jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1709,7 +1741,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1721,7 +1753,7 @@ msgstr "Ελέγχθηκε από το τμήμα μέσα σε μία εργά
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1745,7 +1777,7 @@ msgstr ""
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1757,7 +1789,7 @@ msgstr "Όνομα:"
 msgid "Name: %s"
 msgstr "Όνομα: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1859,7 +1891,7 @@ msgstr "Νέα κατάσταση"
 msgid "New template"
 msgstr "Νέο πρότυπο"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1874,7 +1906,7 @@ msgstr "Επόμενο"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1895,7 +1927,7 @@ msgstr "Κανένας τομέας"
 msgid "No council"
 msgstr "Καμιά υπηρεσία"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Δεν επιλέχθηκε κάποια υπηρεσία"
 
@@ -1958,7 +1990,7 @@ msgstr ""
 "Ανάλογα με την υλοποίηση, οι χρήστες προσωπικού ίσως έχουν πρόσβαση στον πίνακα εργαλείων (περίληψη της δραστηριότητάς τους μέσα στον τομέα), τη δυνατότητα να κρύβουν αναφορές ή να ορίζουν ειδικές αναφορές κατάστασης."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2036,15 +2068,15 @@ msgstr "Παλιά <br>διορθωμένα"
 msgid "Older <br>problems"
 msgstr "Παλιά <br>προβλήματα"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2090,13 +2122,13 @@ msgstr "Ή προβλήματα που αναφέρθηκαν σε:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ή μπορείς να λαμβάνεις ειδοποιήσεις που αφορούν μία συγκεκριμένη υπηρεσία της περιοχής:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2117,7 +2149,7 @@ msgid "Parent"
 msgstr "Πηγή"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Εν μέρει"
 
@@ -2151,7 +2183,7 @@ msgid "Phone number (optional)"
 msgstr "Αριθμός τηλεφώνου (προαιρετικό)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2203,7 +2235,7 @@ msgstr "Θέση της περιοχής στο χάρτη"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2231,14 +2263,14 @@ msgid "Please check your email address is correct"
 msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Παρακαλούμε επίλεξε μια κατηγορία"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Παρακαλούμε επίλεξε ένα είδος ακινήτου"
 
@@ -2262,13 +2294,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Παρακαλούμε να μην κάνεις κατάχρηση&nbsp;&mdash; η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Παρακαλούμε γράψε ένα μήνυμα"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Παρακαλώ γράψτε ένα όνομα"
 
@@ -2283,13 +2315,13 @@ msgid "Please enter a password"
 msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Παρακαλούμε γράψε ένα θέμα"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2302,7 +2334,7 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email"
 msgid "Please enter a valid email address"
 msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες"
@@ -2335,8 +2367,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Παρακαλούμε γράψε το ονοματεπώνυμό σου, οι υπηρεσίες χρειάζονται αυτή την πληροφορία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσέκαρε το πεδίο παρακάτω"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2373,7 +2405,7 @@ msgstr "Παρακαλούμε συμπλήρωσε τις λεπτομέρει
 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 "Παρακαλούμε συμπλήρωσε την παρακάτω φόρμα με τις λεπτομέρειες του προβλήματος, και περίγραψε την τοποθεσία όσο ακριβέστερα γίνεται στο πεδίο με τις λεπτομέρειες."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Παρακαλούμε σήμανε αν θα ήθελες να λάβεις άλλο ερωτηματολόγιο"
 
@@ -2399,20 +2431,20 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ
 msgid "Please note:"
 msgstr "Παρακαλούμε σημείωσε ότι:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Παρακαλούμε γράψε κείμενο καθώς και δώσε μία φωτογραφία"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Παρακαλούμε πες αν έχεις ξαναναφέρει ένα πρόβλημα στην υπηρεσία στο παρελθόν"
 
@@ -2428,7 +2460,7 @@ msgstr "Παρακαλούμε επίλεξε τη ροή που επιθυμε
 msgid "Please select the type of alert you want"
 msgstr "Παρακαλούμε επίλεξε το είδος της ειδοποίησης που επιθυμείς"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι"
 
@@ -2447,22 +2479,22 @@ msgstr "Παρακαλούμε γράψε ένα μήνυμα"
 msgid "Please write your update here"
 msgstr "Παρακαλούμε γράψε την ενημέρωσή σου εδώ"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Δημοσίευση"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Δημοσιεύθηκε ανώνυμα στις %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Δημοσιεύθηκε από %s (<strong>%s</strong>) στις %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Δημοσιεύθηκε από %s στις %s"
 
@@ -2478,7 +2510,8 @@ msgstr "Προηγούμενα"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2494,10 +2527,15 @@ msgstr "Ιδιωτικότητα και cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Ιδιωτικό"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Ιδιωτικό"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Πρόβλημα"
@@ -2533,11 +2571,11 @@ msgstr "Αλλαγή κατάστασης προβλήματος βάσει απ
 msgid "Problems"
 msgstr "Προβλήματα"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Κοντινά προβλήματα"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Προβλήματα στον χάρτη"
 
@@ -2549,7 +2587,7 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ
 msgid "Problems within %.1fkm of this location"
 msgstr "Λήψη ειδοποιήσεων για προβλήματα σε ακτίνα %.1f χλμ από εδώ"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2573,6 +2611,7 @@ msgstr "Προβλήματα μέσα στα όρια του:"
 msgid "Property address:"
 msgstr "Διεύθυνση ακινήτου:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Δώσε μια ενημέρωση"
@@ -2590,12 +2629,17 @@ msgstr "Η εισαγωγή ονόματος και κωδικού πρόσβα
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Δημόσια απάντηση:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Δημόσια απάντηση:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2619,7 +2663,7 @@ msgstr "Το ερωτηματολόγιο %d απαντήθηκε για το π
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Το ερωτηματολόγιο %d στάλθηκε για το πρόβλημα %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον υποβολέα του προβλήματος"
 
@@ -2627,7 +2671,7 @@ msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Ροή RSS"
 
@@ -2655,7 +2699,7 @@ msgstr "Ροή RSS από %s, στην περιοχή &quot;%s&quot;"
 msgid "RSS feed of nearby problems"
 msgstr "Ροή RSS για κοντινά προβλήματα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2671,12 +2715,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Ροή RSS για πρόσφατα τοπικά προβλήματα"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Ροή RSS για ενημερώσεις σε αυτό το πρόβλημα"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Λήψη email όταν γίνονται ενημερώσεις για αυτό το πρόβλημα"
 
@@ -2698,7 +2742,7 @@ msgstr "Πρόσφατα <br>διορθωμένα"
 msgid "Recently reported problems"
 msgstr "Πρόσφατες αναφορές προβλημάτων"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2706,13 +2750,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Αφαίρεση σήμανσης"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2720,7 +2766,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2734,7 +2780,8 @@ msgstr "Απάντηση στον χρήστη:"
 msgid "Report"
 msgstr "Αναφορά"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2744,6 +2791,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Αναφορά προβλήματος"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Αναφορά κατάχρησης"
@@ -2767,8 +2815,8 @@ msgstr "Ανάφερε το πρόβλημά σου"
 msgid "Report, view, or discuss local problems"
 msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλήματα"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Αναφέρθηκε ανώνυμα στις %s"
 
@@ -2777,8 +2825,8 @@ msgstr "Αναφέρθηκε ανώνυμα στις %s"
 msgid "Reported before"
 msgstr "Αναφέρθηκε προηγουμένως"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Αναφέρθηκε από %s στις %s"
 
@@ -2791,27 +2839,27 @@ msgstr "Αναφέρθηκε από:"
 msgid "Reported in the %s category"
 msgstr "Αναφέρθηκε στην κατηγορία %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s"
 
@@ -2921,16 +2969,16 @@ msgstr "Χειριστής δρόμου για την ονομασμένη οδ
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2941,21 +2989,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Αν περιστρέψετε την φωτογραφία θα χαθούν οι αλλαγές που κάνατε στην αναφορά."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Δορυφόρος"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "σημειωμένη ως διπλή αναφορά"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Αποθήκευση αλλαγών"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2992,6 +3045,10 @@ msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3035,27 +3092,27 @@ msgstr "Στάλθηκε:"
 msgid "Service:"
 msgstr "Υπηρεσία:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Κοινοποίηση"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3127,7 +3184,7 @@ msgstr "Λυπούμαστε, αυτός δεν είναι ένας έγκυρο
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3175,12 +3232,14 @@ msgstr "Ημερομηνία Έναρξης:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Κατάσταση"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3220,7 +3279,7 @@ msgstr "Υποκατηγορία: %s"
 msgid "Subdivision/Body"
 msgstr "Τμήμα/Σώμα"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Θέμα"
 
@@ -3237,7 +3296,7 @@ msgstr "Θέμα:"
 msgid "Submit"
 msgstr "Υποβολή"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3263,7 +3322,7 @@ msgid "Submitted"
 msgstr "Υποβλήθηκε"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Γίνε συνδρομητής"
 
@@ -3542,7 +3601,7 @@ msgstr "Υπήρξε πρόβλημα στην προβολή της σελίδ
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της σελίδας. Παρακαλούμε προσπάθησε αργότερα."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3632,9 +3691,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Αυτή η πληροφορία απαιτείται"
@@ -3659,6 +3718,10 @@ msgstr "Αυτό το πρόβλημα έχει διορθωθεί"
 msgid "This problem has not been fixed"
 msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3733,7 +3796,8 @@ msgstr "Για την προβολή ενός χάρτη με την ακριβ
 msgid "Total"
 msgstr "Σύνολο"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3741,7 +3805,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3758,14 +3822,14 @@ msgid "Try emailing us directly:"
 msgstr "Στείλε μας ένα email:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Δεν είναι εφικτή η διόρθωση"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3785,8 +3849,8 @@ msgstr "Άγνωστο"
 msgid "Unknown alert type"
 msgstr "Άγνωστο είδος ειδοποίησης"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
@@ -3797,6 +3861,10 @@ msgstr "Άγνωστο σφάλμα"
 msgid "Unknown problem ID"
 msgstr "Άγνωστη ταυτότητα προβλήματος"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Ενημέρωση"
@@ -3850,7 +3918,7 @@ msgid "Updated"
 msgstr "Ενημερώθηκε"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3865,7 +3933,7 @@ msgstr "Ενημερώθηκε!"
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου"
 
@@ -3896,11 +3964,11 @@ msgstr "Χάρτης σε χρήση"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Η επισήμανση του χρήστη αφαιρέθηκε"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Ο χρήστης επισημάνθηκε"
 
@@ -3909,7 +3977,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3999,6 +4067,10 @@ msgstr "Όταν διορθώθηκε"
 msgid "When sent"
 msgstr "Όταν αποστάλθηκε "
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Ήρεμα ρε Τεστίνο! Τρεις φωτογραφίες είναι αρκετές."
@@ -4047,7 +4119,7 @@ msgstr "Έτος"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4062,11 +4134,11 @@ msgstr "Ναι"
 msgid "Yes I have a password"
 msgstr "Ναι έχω κωδικό πρόσβασης"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλήματος διαγράφτηκε από τον διαχειριστή χωρίς λόγο: "
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:"
 
@@ -4083,7 +4155,7 @@ msgstr "Μπορείς να <a href=\"%s%s\">δεις το πρόβλημα σε
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Μπορείς να επικοινωνήσεις για τεχνική υποστήριξη στο <a href='mailto:%s'>%s</a>"
 
@@ -4180,9 +4252,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4202,7 +4274,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν μόνο σύμφωνα με την <a href=\"/privacy\">πολιτική απορρήτου</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4281,53 +4353,53 @@ msgstr "επεξεργασία χρήστη"
 msgid "from %s different users"
 msgstr "από %s διαφορετικούς χρήστες"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "τελευταία ενημέρωση %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "λιγότερο από ένα λεπτό"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "σημειωμένη ως διπλή αναφορά"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "σημειωμένη ως προγραμματισμένη δράση"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "σημειωμένη ως εσωτερική αναφορά"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "σημειωμένο ως κλειστό"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "σημειωμένο ως διορθωμένο"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "σημειωμένο ως σε διαδικασία αντιμετώπισης"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "σημειωμένο ως υπό έλεγχο"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "σημειωμένο ως προγραμματισμένο"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "σημειωμένο ως αδύνατο να διορθωθεί"
 
@@ -4373,8 +4445,8 @@ msgstr "αναφέρθηκε αρχικά από: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "άλλες περιοχές:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "άνοιξε ξανά"
 
@@ -4420,55 +4492,48 @@ msgstr "ο χρήστης είναι ο ιδιοκτήτης του προβλή
 msgid "ward"
 msgstr "πτέρυγα"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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> πρόσφατες αναφορές"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ημέρα"
+msgstr[1] "%d ημέρες"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d υποστηρικτής"
-msgstr[1] "%d υποστηρικτές"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
-#: 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] "<big>%s</big> ενημέρωση σε αναφορές"
-msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d υποστηρικτής"
+msgstr[1] "%d υποστηρικτές"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d εβδομάδα"
 msgstr[1] "%d εβδομάδες"
 
+#: 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] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα"
+msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4476,19 +4541,19 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> αναφορά μέσα στην προηγούμενη εβδομάδα"
 msgstr[1] "<big>%s</big> αναφορές μέσα στην προηγούμενη εβδομάδα"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα"
-msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> πρόσφατη αναφορά"
+msgstr[1] "<big>%s</big> πρόσφατες αναφορές"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ημέρα"
-msgstr[1] "%d ημέρες"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> ενημέρωση σε αναφορές"
+msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4496,3 +4561,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για το άλλο συμβούλιο που είναι αρμόδια σε αυτήν την τοποθεσία."
 msgstr[1] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για τις υπόλοιπες υπηρεσίες που είναι αρμόδιες για αυτήν την τοποθεσία."
+
+#: 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] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία."
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index 3f5b66e24..76d91112d 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/mysociety/teams/12067/es_ES/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " y "
@@ -110,7 +110,7 @@ msgstr "%s barrio, %s"
 msgid "%s, within %s ward"
 msgstr "%s, en %s barrio"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; colaboradores <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -118,7 +118,7 @@ msgstr "&copy; colaboradores <a href=\"http://www.openstreetmap.org/copyright\">
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(email registrado en la tabla de abusos)"
@@ -142,12 +142,10 @@ msgstr "(distancia que cubre aproximadamente 200.000 personas)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(cerrado)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(arreglado)"
@@ -156,7 +154,7 @@ msgstr "(arreglado)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
@@ -164,21 +162,21 @@ msgstr "(no enviadas al ayuntamiento)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(enviado a ambos)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Escoja un tipo de propiedad --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -197,8 +195,8 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong>- permítanme registrarme por email"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -268,26 +266,29 @@ msgstr "Agregue un órgano"
 msgid "Add new category"
 msgstr "Agregar nueva categoría"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Añadido %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -350,7 +351,7 @@ msgstr "Una actualización marcó este problema como arreglado."
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anónimo:"
@@ -405,7 +406,7 @@ msgstr "Asignar a un órgano externo:"
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -430,8 +431,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -439,7 +440,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
@@ -452,12 +453,12 @@ msgstr "Atras"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Suspender este email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -488,10 +489,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -504,7 +501,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -524,7 +522,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Ratio de arreglo de problemas > 4 semanas"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -600,6 +598,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -628,10 +630,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -733,8 +736,8 @@ msgstr "Contactar con el equipo"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "No se pudo encontrar el usuario"
 
@@ -788,7 +791,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -895,21 +898,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "No lo sé"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "¿No te gustan los formularios?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicado"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplicado"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplicado"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -921,7 +938,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -940,11 +958,11 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -995,7 +1013,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email añadido a lista de abusones"
 
@@ -1013,11 +1031,11 @@ msgstr "Creada alerta de email"
 msgid "Email alert deleted"
 msgstr "Borrada alerta de email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Email ya incluido en la lista de abusones"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1091,7 +1109,7 @@ msgid "Enter details of the problem"
 msgstr "Introduzca detalles del problema"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1113,8 +1131,8 @@ msgstr "Ejemplo de código postal %s"
 msgid "Examples:"
 msgstr "Ejemplos:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1150,7 +1168,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1172,11 +1191,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1184,12 +1204,12 @@ msgid "Fixed"
 msgstr "Arreglado"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Arreglado - Ayuntamiento"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Arreglado - Usuario"
 
@@ -1207,7 +1227,7 @@ msgstr "Arreglado:"
 msgid "Flag as deleted"
 msgstr "Marcar como borrado"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Marca usuario"
 
@@ -1228,7 +1248,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Marcado:"
@@ -1266,7 +1286,7 @@ msgid "Frequently Asked Questions"
 msgstr "Listado de Preguntas Frecuentes"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Recibe actualizaciones"
 
@@ -1292,7 +1312,7 @@ msgstr "¡Nos alegra saber que ha sido arreglado!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ir"
@@ -1301,7 +1321,7 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1343,8 +1363,8 @@ msgstr "%s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1387,7 +1407,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Acabo de actualizar un problema en @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "No se ha podido localizar su problema en la base de datos.\n"
 
@@ -1437,6 +1457,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1504,7 +1528,7 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1540,7 +1564,7 @@ msgid "Internal notes"
 msgstr "Notas internas"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Remisión interna"
 
@@ -1548,7 +1572,7 @@ msgstr "Remisión interna"
 msgid "Invalid agency_responsible value %s"
 msgstr "Valor inválido para agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Fecha de fin inválida"
 
@@ -1556,16 +1580,16 @@ msgstr "Fecha de fin inválida"
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Fecha de inicio no válida"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1611,7 +1635,11 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1656,6 +1684,10 @@ msgstr "MAPA"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr " Mapa"
@@ -1680,7 +1712,7 @@ msgstr "Marcado como resuelto/cerrado hace más de ocho semanas"
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Mensaje:"
 
@@ -1700,7 +1732,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1708,7 +1740,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1720,7 +1752,7 @@ msgstr "Moderado por el organismo durante el siguiente día laborable"
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1744,7 +1776,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1756,7 +1788,7 @@ msgstr "Nombre:"
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1858,7 +1890,7 @@ msgstr "Nuevo estado"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1873,7 +1905,7 @@ msgstr "Siguiente"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1894,7 +1926,7 @@ msgstr "Sin órgano administrativo"
 msgid "No council"
 msgstr "Sin ayuntamiento"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -1960,7 +1992,7 @@ msgstr ""
 "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2038,15 +2070,15 @@ msgstr "Antiguo <br>arreglado"
 msgid "Older <br>problems"
 msgstr "Problemas <br>antiguos"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2092,13 +2124,13 @@ msgstr "O problemas notificados a:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2119,7 +2151,7 @@ msgid "Parent"
 msgstr "Padre"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Parcial"
 
@@ -2153,7 +2185,7 @@ msgid "Phone number (optional)"
 msgstr "Número de teléfono (opcional)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2205,7 +2237,7 @@ msgstr "Coloque el marcador en el mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2233,14 +2265,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Por favor, elija un tipo de propiedad"
 
@@ -2261,13 +2293,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2282,13 +2314,13 @@ msgid "Please enter a password"
 msgstr "Por favor, introduzca una contraseña"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2301,7 +2333,7 @@ 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/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
@@ -2334,8 +2366,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2372,7 +2404,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema."
 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, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario"
 
@@ -2398,20 +2430,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Por favor, tenga en cuenta:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Proporcione un texto y una foto"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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."
 
@@ -2427,7 +2459,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
@@ -2446,22 +2478,22 @@ msgstr "Por favor, escriba un mensaje"
 msgid "Please write your update here"
 msgstr "Por favor, escriba su actualización aquí"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Publicar"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Publicado por %s (<strong>%s</strong>) - %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
@@ -2477,7 +2509,8 @@ msgstr "Previo"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2493,10 +2526,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privado"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privado"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problema"
@@ -2532,11 +2570,11 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta"
 msgid "Problems"
 msgstr "Problemas"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemas cercanos"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemas en el mapa"
 
@@ -2548,7 +2586,7 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas en %.1fkm alrededor"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2572,6 +2610,7 @@ msgstr "Problemas en:"
 msgid "Property address:"
 msgstr "Dirección de la propiedad:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Proporcionar una actualización"
@@ -2589,12 +2628,17 @@ msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le pe
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Respuesta del público:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2618,7 +2662,7 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Cuestionario %d enviado para el problema %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Cuestionario cumplimentado por el notificador problema"
 
@@ -2626,7 +2670,7 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Listado RSS"
 
@@ -2654,7 +2698,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2670,12 +2714,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Listado RSS de los problemas locales más recientes"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Listado RSS de actualizaciones sobre este problema"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema."
 
@@ -2697,7 +2741,7 @@ msgstr "Recientemente <br>arreglado"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2705,13 +2749,15 @@ 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 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Eliminar marca"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2719,7 +2765,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2733,7 +2779,8 @@ msgstr ""
 msgid "Report"
 msgstr "Notificar"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2743,6 +2790,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Notificar un problema"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Denunciar abuso"
@@ -2766,8 +2814,8 @@ msgstr "Notifique su incidencia"
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
 
@@ -2776,8 +2824,8 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
 
@@ -2790,27 +2838,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 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:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 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"
 
@@ -2920,16 +2968,16 @@ msgstr "Operador responsable de este camino (derivado del número de referencia
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2940,21 +2988,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satélite"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "marcado como un informe duplicado"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2991,6 +3044,10 @@ msgstr "La búsqueda no encontró usuarios."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3034,27 +3091,27 @@ msgstr "Enviado:"
 msgid "Service:"
 msgstr "Servicio:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3128,7 +3185,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3176,12 +3233,14 @@ msgstr "Fecha de inicio:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3221,7 +3280,7 @@ msgstr "Subcategoria: %s"
 msgid "Subdivision/Body"
 msgstr "Subdivisión/Órgano"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Título"
 
@@ -3238,7 +3297,7 @@ msgstr "Título:"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3264,7 +3323,7 @@ msgid "Submitted"
 msgstr "Enviado"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -3545,7 +3604,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3636,9 +3695,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Esta información es necesaria"
@@ -3663,6 +3722,10 @@ msgstr "Este problema se ha arreglado"
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3737,7 +3800,8 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3745,7 +3809,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3762,14 +3826,14 @@ msgid "Try emailing us directly:"
 msgstr "Pruebe enviándonos un correo directamente:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Incapaz de arreglarlo"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3789,8 +3853,8 @@ msgstr "Desconocido"
 msgid "Unknown alert type"
 msgstr "Tipo de alerta desconocida"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -3801,6 +3865,10 @@ msgstr "Error desconocido"
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Actualizar"
@@ -3854,7 +3922,7 @@ msgid "Updated"
 msgstr "Actualizado"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3869,7 +3937,7 @@ msgstr "¡Actualizado!"
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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."
 
@@ -3900,11 +3968,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Eliminada marca de usuario"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Usuario marcado"
 
@@ -3913,7 +3981,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4003,6 +4071,10 @@ msgstr "Una vez editada"
 msgid "When sent"
 msgstr "Una vez enviada"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4051,7 +4123,7 @@ msgstr "Año"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4066,11 +4138,11 @@ msgstr "SÍ"
 msgid "Yes I have a password"
 msgstr "Sí, tengo una contraseña"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o  similar:"
 
@@ -4087,7 +4159,7 @@ msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>"
 
@@ -4184,9 +4256,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4206,7 +4278,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4285,53 +4357,53 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultima actualización %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "marcado como un informe duplicado"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "marcado como una referencia interna"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "marcado como cerrado"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "marcado como arreglado"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "marcado como en progreso"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "marcado como que no se puede arreglar"
 
@@ -4377,8 +4449,8 @@ msgstr "consignados inicialmente:"
 msgid "other areas:"
 msgstr "otras áreas:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "reabierto"
 
@@ -4424,55 +4496,48 @@ msgstr "El usuario es el propietario del problema"
 msgid "ward"
 msgstr "barrio"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d simpatizante"
-msgstr[1] "%d simpatizantes"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: 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] "<big>%s</big> notificaciones actualizadas"
-msgstr[1] "<big>%s</big> notificaciones actualizadas"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
-msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d simpatizante"
+msgstr[1] "%d simpatizantes"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: 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] "<big>%s</big> arregladas la semana pasada"
+msgstr[1] "<big>%s</big> arregladas el mes pasado"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4480,19 +4545,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dia"
-msgstr[1] "%d dias"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> notificaciones actualizadas"
+msgstr[1] "<big>%s</big> notificaciones actualizadas"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4500,3 +4565,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
 msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área."
+
+#: 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
+msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2896d3eff..d01c119e7 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robert Lo Bue <rob@applingua.com>, 2017\n"
 "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " y "
@@ -119,7 +119,7 @@ msgstr "%s barrio, %s"
 msgid "%s, within %s ward"
 msgstr "%s, en %s barrio"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> colaboradores"
 
@@ -127,7 +127,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Defecto &amp; ubicación del defecto)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(email registrado en la tabla de abusos)"
@@ -151,12 +151,10 @@ msgstr "(distancia que cubre aproximadamente 200.000 personas)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(un listado RSS podría ser diseñado alternativamente, dentro de %es)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(cerrado)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(arreglado)"
@@ -165,7 +163,7 @@ msgstr "(arreglado)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
@@ -173,21 +171,21 @@ msgstr "(no enviadas al ayuntamiento)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(enviado a ambos)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Escoja un tipo de propiedad --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Elija una plantilla--"
 
@@ -206,8 +204,8 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
@@ -230,11 +228,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong>- permítanme registrarme por email"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 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."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 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."
 
@@ -245,7 +243,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,26 +275,29 @@ msgstr "Agregue un órgano"
 msgid "Add new category"
 msgstr "Agregar nueva categoría"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Añadir a la lista de pre-seleccionados"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Añadir/editar las categorias del problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Añadir/Editar las prioridades de respuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Añadir/Editar las plantillas de respuesta"
 
@@ -304,7 +305,7 @@ msgstr "Añadir/Editar las plantillas de respuesta"
 msgid "Added %s"
 msgstr "Añadido %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados."
 
@@ -359,7 +360,7 @@ msgstr "Una actualización marcó este problema como arreglado."
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anónimo:"
@@ -414,7 +415,7 @@ msgstr "Asignar a un órgano externo:"
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr "Asignar usuarios a las áreas"
 
@@ -439,8 +440,8 @@ msgstr "Usuarios del personal autorizado pueden estar asociados a las categoría
 msgid "Auto-response:"
 msgstr "Respuesta automática:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Categorías disponibles"
 
@@ -448,7 +449,7 @@ msgstr "Categorías disponibles"
 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:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
@@ -461,12 +462,12 @@ msgstr "Atras"
 msgid "Back to all reports"
 msgstr "Volver a todos los informes"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Suspender este email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -497,10 +498,6 @@ msgstr "¿No puede&rsquo;t encontrar nuestro email? Busque en su folder de email
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -513,7 +510,8 @@ msgstr "Categorías:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -533,7 +531,7 @@ msgstr "Categoría cambiada de ‘%s’ a ‘%s’"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Ratio de arreglo de problemas > 4 semanas"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -609,6 +607,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -637,10 +639,11 @@ msgstr "Haga un click en nuestro email de confirmación para iniciar sesión."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -742,8 +745,8 @@ msgstr "Contactar con el equipo"
 msgid "Coordinates:"
 msgstr "Coordenadas:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "No se pudo encontrar el usuario"
 
@@ -797,7 +800,7 @@ msgstr "Crear informes/actualizaciones como ayuntamiento"
 msgid "Create reports/updates on a user's behalf"
 msgstr "Crear informes/actualizaciones en nombre del usuario"
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Crear plantillas"
@@ -838,7 +841,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Eliminar plantilla"
@@ -904,21 +907,35 @@ msgstr "¿Tiene una contraseña %s?"
 msgid "Don&rsquo;t know"
 msgstr "No lo sé"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "¿No te gustan los formularios?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Deslice y deje las fotos aquí o <u>haga click para subir</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicado"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplicado"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplicado"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -930,7 +947,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr "Falso este/Falso norte:"
 
@@ -949,11 +967,11 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "Editar los detalles de otros usuarios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "Editar los permisos de otros usuarios"
 
@@ -1004,7 +1022,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email añadido a lista de abusones"
 
@@ -1022,11 +1040,11 @@ msgstr "Creada alerta de email"
 msgid "Email alert deleted"
 msgstr "Borrada alerta de email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Email ya incluido en la lista de abusones"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1100,7 +1118,7 @@ msgid "Enter details of the problem"
 msgstr "Introduzca detalles del problema"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1122,8 +1140,8 @@ msgstr "Ejemplo de código postal %s"
 msgid "Examples:"
 msgstr "Ejemplos:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "Categoría existente"
 
@@ -1159,7 +1177,8 @@ msgstr "Equipo externo"
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "Detalles adicionales"
 
@@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1193,12 +1213,12 @@ msgid "Fixed"
 msgstr "Arreglado"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Arreglado - Ayuntamiento"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Arreglado - Usuario"
 
@@ -1216,7 +1236,7 @@ msgstr "Arreglado:"
 msgid "Flag as deleted"
 msgstr "Marcar como borrado"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Marca usuario"
 
@@ -1237,7 +1257,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Marcado:"
@@ -1275,7 +1295,7 @@ msgid "Frequently Asked Questions"
 msgstr "Listado de Preguntas Frecuentes"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Recibe actualizaciones"
 
@@ -1301,7 +1321,7 @@ msgstr "¡Nos alegra saber que ha sido arreglado!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ir"
@@ -1310,7 +1330,7 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "Permitir el acceso al administrador"
 
@@ -1352,8 +1372,8 @@ msgstr "%s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1396,7 +1416,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Acabo de actualizar un problema en @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "No se ha podido localizar su problema en la base de datos.\n"
 
@@ -1446,6 +1466,10 @@ 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/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1515,7 +1539,7 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1551,7 +1575,7 @@ msgid "Internal notes"
 msgstr "Notas internas"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Remisión interna"
 
@@ -1559,7 +1583,7 @@ msgstr "Remisión interna"
 msgid "Invalid agency_responsible value %s"
 msgstr "Valor inválido para agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Fecha de fin inválida"
 
@@ -1567,16 +1591,16 @@ msgstr "Fecha de fin inválida"
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Fecha de inicio no válida"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1622,7 +1646,11 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr "Menos recientemente actualizado"
 
@@ -1667,6 +1695,10 @@ msgstr "MAPA"
 msgid "Manage shortlist"
 msgstr "Administrar los pre-seleccionados"
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr " Mapa"
@@ -1691,7 +1723,7 @@ msgstr "Marcado como resuelto/cerrado hace más de ocho semanas"
 msgid "Markup problem details"
 msgstr "Marcar los detalles del problema"
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Mensaje:"
 
@@ -1711,7 +1743,7 @@ msgstr "Organismos administrativos perdidos:"
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr "Moderar"
 
@@ -1719,7 +1751,7 @@ msgstr "Moderar"
 msgid "Moderate report details"
 msgstr "Moderar los detalles del informe"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr "Moderar este informe"
 
@@ -1731,7 +1763,7 @@ msgstr "Moderado por el organismo durante el siguiente día laborable"
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "Lo más comentado"
 
@@ -1755,7 +1787,7 @@ msgstr "Lo más comentado"
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1767,7 +1799,7 @@ msgstr "Nombre:"
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr "Navegue a este problema"
 
@@ -1869,7 +1901,7 @@ msgstr "Nuevo estado"
 msgid "New template"
 msgstr "Plantilla nueva"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "Lo más reciente"
 
@@ -1884,7 +1916,7 @@ msgstr "Siguiente"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1905,7 +1937,7 @@ msgstr "Sin órgano administrativo"
 msgid "No council"
 msgstr "Sin ayuntamiento"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -1973,7 +2005,7 @@ msgstr ""
 "la actividad a través de su departamento), la capacidad de ocultar notificaciones, o establecer estados especiales para las notificaciones."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2051,15 +2083,15 @@ msgstr "Antiguo <br>arreglado"
 msgid "Older <br>problems"
 msgstr "Problemas <br>antiguos"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "Lo más antiguo"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2105,13 +2137,13 @@ msgstr "O problemas notificados a:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2132,7 +2164,7 @@ msgid "Parent"
 msgstr "Padre"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Parcial"
 
@@ -2166,7 +2198,7 @@ msgid "Phone number (optional)"
 msgstr "Número de teléfono (opcional)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2218,7 +2250,7 @@ msgstr "Coloque el marcador en el mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2246,14 +2278,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Por favor, elija un tipo de propiedad"
 
@@ -2274,13 +2306,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Por favor, indique un nombre"
 
@@ -2295,13 +2327,13 @@ msgid "Please enter a password"
 msgstr "Por favor, introduzca una contraseña"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2314,7 +2346,7 @@ 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/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
@@ -2347,8 +2379,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2385,7 +2417,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema."
 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, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario"
 
@@ -2411,20 +2443,20 @@ 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:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 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:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Proporcione un texto y una foto"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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."
 
@@ -2440,7 +2472,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
@@ -2459,22 +2491,22 @@ msgstr "Por favor, escriba un mensaje"
 msgid "Please write your update here"
 msgstr "Por favor, escriba su actualización aquí"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Publicar"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Publicado por %s (<strong>%s</strong>) - %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
@@ -2490,7 +2522,8 @@ msgstr "Previo"
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -2506,10 +2539,15 @@ msgstr "Privacidad y cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privado"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Detalles adicionales"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problema"
@@ -2545,11 +2583,11 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta"
 msgid "Problems"
 msgstr "Problemas"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemas cercanos"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemas en el mapa"
 
@@ -2561,7 +2599,7 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas en %.1fkm alrededor"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2585,6 +2623,7 @@ msgstr "Problemas en:"
 msgid "Property address:"
 msgstr "Dirección de la propiedad:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Proporcionar una actualización"
@@ -2602,12 +2641,17 @@ msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le pe
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Actualización pública:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr "Actualización pública:"
 
@@ -2631,7 +2675,7 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Cuestionario %d enviado para el problema %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Cuestionario cumplimentado por el notificador problema"
 
@@ -2639,7 +2683,7 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Listado RSS"
 
@@ -2667,7 +2711,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2683,12 +2727,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Listado RSS de los problemas locales más recientes"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Listado RSS de actualizaciones sobre este problema"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema."
 
@@ -2710,7 +2754,7 @@ msgstr "Recientemente <br>arreglado"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr "Recientemente actualizado"
 
@@ -2718,13 +2762,15 @@ msgstr "Recientemente actualizado"
 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Eliminar marca"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr "Eliminar de los pre-seleccionados"
 
@@ -2732,7 +2778,7 @@ msgstr "Eliminar de los pre-seleccionados"
 msgid "Remove from site"
 msgstr "Eliminar de la site"
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2746,7 +2792,8 @@ msgstr "Responder al usuario:"
 msgid "Report"
 msgstr "Notificar"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "ID del informe:"
 
@@ -2756,6 +2803,7 @@ msgstr "ID del informe:"
 msgid "Report a problem"
 msgstr "Notificar un problema"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Denunciar abuso"
@@ -2779,8 +2827,8 @@ msgstr "Notifique su incidencia"
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
 
@@ -2789,8 +2837,8 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
 
@@ -2803,27 +2851,27 @@ msgstr "Notificado por:"
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 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:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 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"
 
@@ -2933,16 +2981,16 @@ msgstr "Operador responsable de este camino (derivado del número de referencia
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2953,21 +3001,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rotar esta foto eliminará los cambios no guardados al informe."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satélite"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "marcado como un informe duplicado"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr "Guardar con una actualización pública"
 
@@ -3004,6 +3057,11 @@ msgstr "La búsqueda no encontró usuarios."
 msgid "See our privacy policy"
 msgstr "Ver nuestra política de privacidad"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#, fuzzy
+msgid "See user detail for reports created as the council"
+msgstr "Crear informes/actualizaciones como ayuntamiento"
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3047,27 +3105,27 @@ msgstr "Enviado:"
 msgid "Service:"
 msgstr "Servicio:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr "Ajustar a mi ubicación actual"
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr "Pre-seleccionados"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr "Entre los pre-seleccionados"
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr "Pre-seleecionados por %s"
 
@@ -3141,7 +3199,7 @@ msgstr "Lo sentimos, este no fue&rsquo; un enlace válido"
 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3189,12 +3247,14 @@ msgstr "Fecha de inicio:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3234,7 +3294,7 @@ msgstr "Subcategoria: %s"
 msgid "Subdivision/Body"
 msgstr "Subdivisión/Órgano"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Título"
 
@@ -3251,7 +3311,7 @@ msgstr "Título:"
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3277,7 +3337,7 @@ msgid "Submitted"
 msgstr "Enviado"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -3558,7 +3618,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3649,9 +3709,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Esta información es necesaria"
@@ -3676,6 +3736,10 @@ msgstr "Este problema se ha arreglado"
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3750,7 +3814,8 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr "¿Se necesita administración del tráfico?"
 
@@ -3758,7 +3823,7 @@ msgstr "¿Se necesita administración del tráfico?"
 msgid "Trusted by bodies:"
 msgstr "Confiables por los organismos administrativos:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Acreditado para hacer informes que no requieren inspección"
 
@@ -3775,14 +3840,14 @@ msgid "Try emailing us directly:"
 msgstr "Pruebe enviándonos un correo directamente:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Incapaz de arreglarlo"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3802,8 +3867,8 @@ msgstr "Desconocido"
 msgid "Unknown alert type"
 msgstr "Tipo de alerta desconocida"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -3814,6 +3879,10 @@ msgstr "Error desconocido"
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Actualizar"
@@ -3867,7 +3936,7 @@ msgid "Updated"
 msgstr "Actualizado"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3882,7 +3951,7 @@ msgstr "¡Actualizado!"
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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."
 
@@ -3913,11 +3982,11 @@ msgstr "Mapa usado"
 msgid "User ID to attribute fetched comments to"
 msgstr "ID de usuario a quien atribuir los comentarios obtenidos"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Eliminada marca de usuario"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Usuario marcado"
 
@@ -3926,7 +3995,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4016,6 +4085,10 @@ msgstr "Una vez editada"
 msgid "When sent"
 msgstr "Una vez enviada"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "¡Espere! Tres fotos son suficientes."
@@ -4064,7 +4137,7 @@ msgstr "Año"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4079,11 +4152,11 @@ msgstr "SÍ"
 msgid "Yes I have a password"
 msgstr "Sí, tengo una contraseña"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o  similar:"
 
@@ -4100,7 +4173,7 @@ msgstr "Usted puede <a href=\"%s%s\">ver el problema en este sitio</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>"
 
@@ -4197,9 +4270,9 @@ msgstr "Su cuenta"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4219,7 +4292,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4298,53 +4371,53 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultima actualización %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "marcado como un informe duplicado"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "marcado como una referencia interna"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "marcado como cerrado"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "marcado como arreglado"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "marcado como en progreso"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "marcado como que no se puede arreglar"
 
@@ -4390,8 +4463,8 @@ msgstr "consignados inicialmente:"
 msgid "other areas:"
 msgstr "otras áreas:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "reabierto"
 
@@ -4437,55 +4510,48 @@ msgstr "El usuario es el propietario del problema"
 msgid "ward"
 msgstr "barrio"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d simpatizante"
-msgstr[1] "%d simpatizantes"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: 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] "<big>%s</big> notificaciones actualizadas"
-msgstr[1] "<big>%s</big> notificaciones actualizadas"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
-msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d simpatizante"
+msgstr[1] "%d simpatizantes"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: 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] "<big>%s</big> arregladas la semana pasada"
+msgstr[1] "<big>%s</big> arregladas el mes pasado"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4493,19 +4559,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dia"
-msgstr[1] "%d dias"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> notificaciones actualizadas"
+msgstr[1] "<big>%s</big> notificaciones actualizadas"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4513,3 +4579,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
 msgstr[1] "Todavía <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área."
+
+#: 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
+msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index efdaf61b4..01ae973e4 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>, 2016\n"
 "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " et "
@@ -120,7 +120,7 @@ msgstr "Localité %s, %s"
 msgid "%s, within %s ward"
 msgstr "%s, dans la localité %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributeurs"
 
@@ -128,7 +128,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Défaut & amp; emplacement du défaut)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(email dans la liste des abus)"
@@ -152,12 +152,10 @@ msgstr "(une distance par défaut qui couvre environ 200 000 personnes)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(alternativement le flux RSS peut être personnalisé, dans %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(fermé)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(résolu)"
@@ -166,7 +164,7 @@ msgstr "(résolu)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(non signalé à l&rsquo;administration)"
 
@@ -174,21 +172,21 @@ msgstr "(non signalé à l&rsquo;administration)"
 msgid "(optional)"
 msgstr "(facultatif)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(envoyé aux deux)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Choisissez une catégorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Choisissez un type de propriété --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Choisissez un modèle--"
 
@@ -207,8 +205,8 @@ msgstr ""
 "             Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).<br>\n"
 "              Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Afficher</label> %s <label for=\"filter_categories\">à propos de</label> %s"
@@ -231,11 +229,11 @@ msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong> Remarque: </strong> Ce rapport a été envoyé pour action. Toutes les modifications apportées ne seront pas transmises."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong> Remarque: </strong> Ce rapport n'a pas encore été envoyé pour action. Toutes les modifications apportées ne peuvent pas être transmises."
 
@@ -246,7 +244,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Oui</strong>, j'ai un mot de passe :"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -278,26 +276,29 @@ msgstr "Ajouter un interlocuteur"
 msgid "Add new category"
 msgstr "Ajouter une nouvelle catégorie"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Ajouter à la liste"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Ajouter/modifier des catégories de problèmes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Ajouter/modifier les priorités de réponse"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Ajouter/modifier des modèles de réponse"
 
@@ -305,7 +306,7 @@ msgstr "Ajouter/modifier des modèles de réponse"
 msgid "Added %s"
 msgstr "Ajouté %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s."
 
@@ -360,7 +361,7 @@ msgstr "Une mise à jour a marqué ce problème comme résolu"
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonyme :"
@@ -415,7 +416,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:"
 msgid "Assign to subdivision:"
 msgstr "Affecté à la subdivision:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr "Affecter des utilisateurs aux zones"
 
@@ -440,8 +441,8 @@ msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur
 msgid "Auto-response:"
 msgstr "Réponse automatique:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Catégories disponibles"
 
@@ -449,7 +450,7 @@ msgstr "Catégories disponibles"
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Évitez les renseignements personnels et les plaques d'immatriculation"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En attente de modération"
@@ -462,12 +463,12 @@ msgstr "Retour"
 msgid "Back to all reports"
 msgstr "Retour vers tous les rapports"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Bannir l'adresse mail"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -498,10 +499,6 @@ 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>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Annuler"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -514,7 +511,8 @@ msgstr "Catégories:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -534,7 +532,7 @@ msgstr "Changement de catégorie de ‘%s’ à ‘%s’"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Taux de résolution pour les problèmes > 4 semaines"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -611,6 +609,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -639,10 +641,11 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -744,8 +747,8 @@ msgstr "Contacter l'équipe"
 msgid "Coordinates:"
 msgstr "Coordonnées:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Impossible de trouver l'utilisateur"
 
@@ -799,7 +802,7 @@ msgstr "Créer des rapports/mises à jour de l'administration"
 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/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Créer un modèle"
@@ -840,7 +843,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Traité par la subdivision dans les 5 jours ouvrables"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Supprimer le modèle"
@@ -906,21 +909,35 @@ msgstr "Avez-vous un mot de passe %s ?"
 msgid "Don&rsquo;t know"
 msgstr "Je ne sais pas"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Vous n'aimez pas les formulaires ?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Glissez et déposez les photos ici ou <u> cliquer pour les envoyer </ u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dupliqué"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Dupliqué"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Dupliqué"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -932,7 +949,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr "Abscisse/Ordonnée :"
 
@@ -951,11 +969,11 @@ msgstr "Éditer"
 msgid "Edit body details"
 msgstr "Editer les détails de l'intelocuteur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "Modifier les détails des autres utilisateurs"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "Modifier les autorisations des autres utilisateurs"
 
@@ -1006,7 +1024,7 @@ msgstr "Éditeur"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email rajouté à la liste des abus"
 
@@ -1024,11 +1042,11 @@ msgstr "Alerte E-mail créé"
 msgid "Email alert deleted"
 msgstr "Alerte E-mail supprimé"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Email déjà présent dans la liste des abus"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1101,7 +1119,7 @@ msgid "Enter details of the problem"
 msgstr "Saisissez les détails du problème"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1123,8 +1141,8 @@ msgstr "Exemple de code postal %s"
 msgid "Examples:"
 msgstr "Exemples :"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "Catégorie existante"
 
@@ -1160,7 +1178,8 @@ msgstr "Équipe externe"
 msgid "Extra data:"
 msgstr "Donnée supplémentaire:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "Précisions supplémentaires"
 
@@ -1182,11 +1201,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le formulaire <em>Saisie des détails interlocuteur</em> ci-dessous."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1194,12 +1214,12 @@ msgid "Fixed"
 msgstr "Résolu"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Résolu - Administration"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Résolu - Usager"
 
@@ -1217,7 +1237,7 @@ msgstr "Résolu :"
 msgid "Flag as deleted"
 msgstr "Signaler comme supprimé"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Signaler l'usager"
 
@@ -1238,7 +1258,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Signalé :"
@@ -1276,7 +1296,7 @@ msgid "Frequently Asked Questions"
 msgstr "Foire Aux Questions"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Recevoir les mises à jour"
 
@@ -1302,7 +1322,7 @@ msgstr "Heureux d'entendre qu'il a été résolu!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ok"
@@ -1311,7 +1331,7 @@ msgstr "Ok"
 msgid "Going to send questionnaire?"
 msgstr "Envoi du questionnaire ?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "Accorder l'accès à l'admin"
 
@@ -1353,8 +1373,8 @@ msgstr "Bienvenue %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1397,7 +1417,7 @@ msgstr "Je viens de signaler un problème sur @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Je viens de mettre à jour un problème sur @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n"
 
@@ -1443,6 +1463,10 @@ 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/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1511,7 +1535,7 @@ msgstr "En plus, les attributs suivants qui ne font pas partie de la spécificat
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1547,7 +1571,7 @@ msgid "Internal notes"
 msgstr "Notes internes"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Référence interne"
 
@@ -1555,7 +1579,7 @@ msgstr "Référence interne"
 msgid "Invalid agency_responsible value %s"
 msgstr "Valeur agency_responsible invalide \"%s\""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Date de fin invalide"
 
@@ -1563,16 +1587,16 @@ msgstr "Date de fin invalide"
 msgid "Invalid format %s specified."
 msgstr "Format spécifié %s invalide"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Date de début invalide"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1618,7 +1642,11 @@ msgstr "Dernière actualisation :"
 msgid "Last&nbsp;update:"
 msgstr "Dernière&nbsp;actualisation :"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr "Moins récemment mis à jour"
 
@@ -1663,6 +1691,10 @@ msgstr "CARTE"
 msgid "Manage shortlist"
 msgstr "Gérer la liste"
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Carte"
@@ -1687,7 +1719,7 @@ msgstr "Marqué fixé / fermé depuis plus de huit semaines"
 msgid "Markup problem details"
 msgstr "Marquer les détails du problème"
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Message"
 
@@ -1707,7 +1739,7 @@ msgstr "Organismes disparus :"
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id manquant"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr "Modérer"
 
@@ -1715,7 +1747,7 @@ msgstr "Modérer"
 msgid "Moderate report details"
 msgstr "Modérer les détails du rapport"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr "Modérer ce rapport"
 
@@ -1727,7 +1759,7 @@ msgstr "Modéré par division dans le délai d'un jour ouvrable"
 msgid "Month"
 msgstr "Mois"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "Les plus commentés"
 
@@ -1751,7 +1783,7 @@ msgstr "Les plus commentés"
 msgid "Name"
 msgstr "Nom"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1763,7 +1795,7 @@ msgstr "Nom :"
 msgid "Name: %s"
 msgstr "Nom: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr "Accédez à ce problème"
 
@@ -1865,7 +1897,7 @@ msgstr "Nouvel état"
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "Plus récents"
 
@@ -1880,7 +1912,7 @@ msgstr "Suivant"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1901,7 +1933,7 @@ msgstr "Aucun intelocuteur"
 msgid "No council"
 msgstr "Pas d'administration"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Aucune administration sélectionnée"
 
@@ -1969,7 +2001,7 @@ msgstr ""
 "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/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2047,15 +2079,15 @@ msgstr "Anciens <br />résolus"
 msgid "Older <br>problems"
 msgstr "Anciens <br />problèmes"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "Plus anciens"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2101,13 +2133,13 @@ msgstr "Ou problèmes signalés à :"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2128,7 +2160,7 @@ msgid "Parent"
 msgstr "Parent"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Partiel"
 
@@ -2162,7 +2194,7 @@ msgid "Phone number (optional)"
 msgstr "Téléphone (facultatif)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2214,7 +2246,7 @@ msgstr "Placer l'épingle sur la carte"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2242,14 +2274,14 @@ msgid "Please check your email address is correct"
 msgstr "Merci de vérifier que votre adresse email est correcte"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Merci de sélectionner une catégorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Merci de choisir un type de propriété"
 
@@ -2273,13 +2305,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Merci d'entrer un message"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Merci d'entrer un nom"
 
@@ -2294,13 +2326,13 @@ msgid "Please enter a password"
 msgstr "Merci d'entrer un mot de passe :"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Merci d'enter un sujet"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2313,7 +2345,7 @@ msgstr "Merci d'entrer un email valide"
 msgid "Please enter a valid email address"
 msgstr "Merci d'entrer une adresse email valide"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Merci d'entrer quelques détails"
@@ -2346,8 +2378,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2384,7 +2416,7 @@ msgstr "Merci d'entrer les détails du problème."
 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 "Merci de remplir le formulaire ci-dessous avec les détails du problème, et de décrir l'emplacement aussi précisément que possible dans les détails."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire"
 
@@ -2410,20 +2442,20 @@ 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:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 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:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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."
 
@@ -2439,7 +2471,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 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."
 
@@ -2458,22 +2490,22 @@ msgstr "Merci de saisir un message"
 msgid "Please write your update here"
 msgstr "Merci d'écrire votre mise à jour ici"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Envoyer"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Signalé anonymement à %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Envoyé par %s (<strong>%s</strong>) à %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Signalé par %s à %s"
 
@@ -2489,7 +2521,8 @@ msgstr "Précédent"
 msgid "Priorities"
 msgstr "Priorités"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "Priorité"
 
@@ -2505,10 +2538,15 @@ msgstr "Vie privée et cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privé"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Précisions supplémentaires"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problème"
@@ -2544,11 +2582,11 @@ msgstr "Changement état des problèmes d'après résultats sondage"
 msgid "Problems"
 msgstr "Problèmes"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problèmes aux alentours"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problèmes sur la carte"
 
@@ -2560,7 +2598,7 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problèmes à moins de %.1fkm de ce lieu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2584,6 +2622,7 @@ msgstr "Problèmes à l'intérieur des limites de :"
 msgid "Property address:"
 msgstr "Adresse de propriété:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Apporter une mise à jour"
@@ -2601,12 +2640,17 @@ msgstr "Fournir un nom et un mot de passe est optionnel, mais cela vous permettr
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Mise à jour publique :"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Réponse publique:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr "Mise à jour publique :"
 
@@ -2630,7 +2674,7 @@ msgstr "Questionnaire %d rempli pour le problème %d, %s à %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Questionnaire %d envoyé pour le problème %s"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Questionnaire rempli par le requérant"
 
@@ -2638,7 +2682,7 @@ msgstr "Questionnaire rempli par le requérant"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Flux RSS"
 
@@ -2666,7 +2710,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2682,12 +2726,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Flux RSS des problèmes locaux récents"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Flux RSS des mises à jour pour ce problème"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Etre informé par courriel lorsque ce problème est mis à jour."
 
@@ -2709,7 +2753,7 @@ msgstr "Récemment<br />résolus"
 msgid "Recently reported problems"
 msgstr "Problèmes signalés récemment"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr "Récemment mis à jour"
 
@@ -2717,13 +2761,15 @@ msgstr "Récemment mis à jour"
 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Effacer le signalement"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr "Supprimer de votre liste"
 
@@ -2731,7 +2777,7 @@ msgstr "Supprimer de votre liste"
 msgid "Remove from site"
 msgstr "Retirer du site"
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2745,7 +2791,8 @@ msgstr "Répondre à l'utilisateur:"
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "Rapport ID :"
 
@@ -2755,6 +2802,7 @@ msgstr "Rapport ID :"
 msgid "Report a problem"
 msgstr "Signaler un problème"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Signaler un abus"
@@ -2778,8 +2826,8 @@ msgstr "Signaler votre problème"
 msgid "Report, view, or discuss local problems"
 msgstr "Signalez et suivez les problèmes locaux"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Signalé anonymement à %s"
 
@@ -2788,8 +2836,8 @@ msgstr "Signalé anonymement à %s"
 msgid "Reported before"
 msgstr "Signalé avant"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Signalé par %s à %s"
 
@@ -2802,27 +2850,27 @@ msgstr "Rapporté par:"
 msgid "Reported in the %s category"
 msgstr "Rapporté dans la catégorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Signalé dans la catégorie %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Signalé par %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Signalé par %s par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Signalé par %s dans la catégorie %s par %s"
 
@@ -2932,16 +2980,16 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2952,21 +3000,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satellite"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "rapport marqué comme dupliqué"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr "Sauvegardez avec une mise à jour publique"
 
@@ -3003,6 +3056,11 @@ msgstr "Aucun utilisateur trouvé lors de la recherche."
 msgid "See our privacy policy"
 msgstr "Voir notre politique de confidentialité"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#, fuzzy
+msgid "See user detail for reports created as the council"
+msgstr "Créer des rapports/mises à jour de l'administration"
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3046,27 +3104,27 @@ msgstr "Envoyé :"
 msgid "Service:"
 msgstr "Service:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr "Situé à mon emplacement actuel"
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Partagez"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr "Liste"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr "Shortlisté"
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr "Shortlisté par %s"
 
@@ -3140,7 +3198,7 @@ msgstr "Désolé, cela n'est pas un lien valide"
 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3188,12 +3246,14 @@ msgstr "Date de début:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "État actuel"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3233,7 +3293,7 @@ msgstr "Sous-catégorie: %s"
 msgid "Subdivision/Body"
 msgstr "Subdivision/Interlocuteur"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Sujet"
 
@@ -3250,7 +3310,7 @@ msgstr "Sujet :"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3276,7 +3336,7 @@ msgid "Submitted"
 msgstr "Soumis"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -3559,7 +3619,7 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3649,9 +3709,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Ces renseignements sont nécessaires"
@@ -3676,6 +3736,10 @@ msgstr "Ce problème a été résolu"
 msgid "This problem has not been fixed"
 msgstr "Ce problème n'a pas été résolu"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3750,7 +3814,8 @@ msgstr "Pour voir une carte de l'emplacement précis de ce problème"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr "La gestion du trafic est nécessaire ?"
 
@@ -3758,7 +3823,7 @@ msgstr "La gestion du trafic est nécessaire ?"
 msgid "Trusted by bodies:"
 msgstr "Accrédité par les organismes:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Accrédité pour faire des rapports sans être inspectés"
 
@@ -3775,14 +3840,14 @@ msgid "Try emailing us directly:"
 msgstr "Essayez en nous envoyant un e-mail directement:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Ne peut être résolu"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3802,8 +3867,8 @@ msgstr "Inconnu"
 msgid "Unknown alert type"
 msgstr "Type d'alerte inconnu"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "erreur inconnue"
@@ -3814,6 +3879,10 @@ msgstr "erreur inconnue"
 msgid "Unknown problem ID"
 msgstr "ID de problème inconnu"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Mise à jour"
@@ -3867,7 +3936,7 @@ msgid "Updated"
 msgstr "Mis à jour"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3882,7 +3951,7 @@ msgstr "Mis à jour !"
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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"
 
@@ -3913,11 +3982,11 @@ msgstr "Carte utilisée"
 msgid "User ID to attribute fetched comments to"
 msgstr "ID utilisateur de récupération des commentaires à"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Utilisateur dé–signalé"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Utilisateur signalé"
 
@@ -3926,7 +3995,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "La recherche utilisateurs parcourt les noms et adresses courriel."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4016,6 +4085,10 @@ msgstr "Édité le"
 msgid "When sent"
 msgstr "Envoyé le"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Trois photos suffisent."
@@ -4064,7 +4137,7 @@ msgstr "Année"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4079,11 +4152,11 @@ msgstr "Oui"
 msgid "Yes I have a password"
 msgstr "Oui j'ai un mot de passe"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Vous ne comprenez pas les raisons pour lesquelles ce rapport a été inutilement retiré:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou similaires :"
 
@@ -4100,7 +4173,7 @@ msgstr "Vous pouvez <a href=\"%s%s\">consulter le problème sur ce site</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Vous pouvez contacte le support technique par le courriel <a href='mailto:%s'>%s</a>"
 
@@ -4194,9 +4267,9 @@ msgstr "Votre compte"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4216,7 +4289,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Votre information sera utilisée seulement en accord avec notre <a href=\"/privacy\">politique de confidentialité</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4295,53 +4368,53 @@ msgstr "saisissez l'utilisateur"
 msgid "from %s different users"
 msgstr "de %s utilisateurs différents"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "dernière mise à jour %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "moins d'une minute"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "rapport marqué comme dupliqué"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "action marquée comme établie"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "marqué comme une référence interne"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "marqué comme terminé"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "marqué(s) comme réglé(s)"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "marqué comme en cours"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "marqué comme en cours d'investigation"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marqué comme n'étant pas de la responsabilité de la commune"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "marqué comme planifié"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "marqué comme impossible à résoudre"
 
@@ -4387,8 +4460,8 @@ msgstr "saisi initialement: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "autres lieux:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "réouvert"
 
@@ -4434,55 +4507,48 @@ msgstr "L'utilisateur est propriétaire du problème"
 msgid "ward"
 msgstr "localité"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d jour"
+msgstr[1] "%d jours"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d supporter"
-msgstr[1] "%d supporters"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: 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] "<big>%s</big> mise à jour de rapport"
-msgstr[1] "<big>%s</big> mises à jour de rapports"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu."
-msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d supporter"
+msgstr[1] "%d supporters"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
+#: 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] "<big>%s</big> résolu le mois passé"
+msgstr[1] "<big>%s</big> résolus le mois passé"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4490,19 +4556,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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é"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d jour"
-msgstr[1] "%d jours"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> mise à jour de rapport"
+msgstr[1] "<big>%s</big> mises à jour de rapports"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4510,3 +4576,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu."
 msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu."
+
+#: 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] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu."
+msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu."
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9c3a39a93..efd539cfe 100644
--- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/he_IL.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
@@ -142,12 +142,10 @@ msgstr ""
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr ""
@@ -156,7 +154,7 @@ msgstr ""
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr ""
 
@@ -164,21 +162,21 @@ msgstr ""
 msgid "(optional)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr ""
 msgid "Add new category"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr ""
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr ""
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr ""
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr ""
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "לא אוהב טפסים?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "כפול"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "כפול"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "כפול"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "ערוך"
 msgid "Edit body details"
 msgstr "ערוך פרטי גוף"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "עורך"
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה"
 
@@ -991,11 +1009,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr ""
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -1178,7 +1198,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr ""
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr ""
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1272,7 +1292,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr ""
 
@@ -1515,16 +1539,16 @@ msgstr ""
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr ""
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr ""
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr ""
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr ""
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2212,13 +2244,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr ""
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2378,7 +2410,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -2397,22 +2429,22 @@ msgstr ""
 msgid "Please write your update here"
 msgstr ""
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -2428,7 +2460,8 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr ""
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "ערוך פרטי גוף"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr ""
@@ -2483,11 +2521,11 @@ msgstr ""
 msgid "Problems"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr ""
 
@@ -2499,7 +2537,7 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr ""
@@ -2540,12 +2579,16 @@ msgstr ""
 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_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2612,7 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2620,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr ""
 
@@ -2605,7 +2648,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2664,12 @@ msgid "RSS feed of recent local problems"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -2648,7 +2691,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2699,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2715,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2729,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2740,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2717,8 +2764,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2727,8 +2774,8 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2741,27 +2788,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2871,16 +2918,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2938,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2993,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3040,27 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3132,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3180,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3227,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -3187,7 +3244,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3270,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3484,7 +3541,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3623,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr ""
@@ -3593,6 +3650,10 @@ msgstr ""
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3728,8 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3737,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3754,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3781,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3731,6 +3793,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3784,7 +3850,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3865,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3896,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3909,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +3999,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4051,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4066,11 @@ msgstr ""
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4087,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4108,9 +4178,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4200,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4279,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr ""
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4301,8 +4371,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -4348,52 +4418,45 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 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:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/front/stats.html:25
+#: templates/web/base/report/_support.html:6
 #, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
+msgid "%d supporter"
+msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/report/new/top_message_none.html:3
+#: perllib/Utils.pm:221
 #, 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."
+msgid "%d week"
+msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:220
+#: templates/web/base/front/stats.html:19
 #, perl-format
-msgid "%d week"
-msgid_plural "%d weeks"
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -4404,17 +4467,17 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -4424,3 +4487,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index e56d48f6e..f76fc8c5d 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "i"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Email na crnoj listi)"
@@ -142,12 +142,10 @@ msgstr "(zadana udaljenost koja obuhvaća približno 200,000 stanovnika)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(zatvoreno)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(popravljeno)"
@@ -156,7 +154,7 @@ msgstr "(popravljeno)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(nije poslano odgovornom tijelu)"
 
@@ -164,21 +162,21 @@ msgstr "(nije poslano odgovornom tijelu)"
 msgid "(optional)"
 msgstr "(nije obavezno)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(poslano na obje adrese)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Izaberi kategoriju --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Izaberite vrstu posjeda --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>No</strong> Potvrdi moje ažuriranje e-mailom"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong> prijavi se e-mailom"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Da</strong> Imam password"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr ""
 msgid "Add new category"
 msgstr "Dodaj novu kategoriju"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Dodano %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "Ažuriranjem je ovaj problem evidentiran kao popravljen."
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonimno:"
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr ""
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Onemogući e-mail adrese"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Ne možete vidjeti mapu? <em>Preskoči ovaj korak</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr " Postotak popravaka za kategoriju > staro 4 tjedna"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Kontaktiraj tim"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Nepoznati korisnik"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,33 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Ne&rsquo;znam"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:71
+msgid "Duplicate of"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:81
+msgid "Duplicates"
+msgstr ""
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +914,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +934,11 @@ msgstr "Uredi"
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +989,7 @@ msgstr "Urednik"
 msgid "Email"
 msgstr "E-mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "E-mail dodan na listu zloupotrebe"
 
@@ -991,11 +1007,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-mail je već na listi zloupotrebe"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1078,7 @@ msgid "Enter details of the problem"
 msgstr "Unesi detalje o problemu"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1100,8 @@ msgstr "Primjer poštanskog broja %s"
 msgid "Examples:"
 msgstr "Primjeri:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1137,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dodatni podaci:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1160,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1173,12 @@ msgid "Fixed"
 msgstr "Popravljeno"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Popravljeno - odgovorno tijelo"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Popravljeno - Korisnik"
 
@@ -1178,7 +1196,7 @@ msgstr "Popravljeno:"
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Označi korisnika"
 
@@ -1199,7 +1217,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Označen:"
@@ -1237,7 +1255,7 @@ msgid "Frequently Asked Questions"
 msgstr "Često postavljana pitanja"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Primite ažuriranja"
 
@@ -1263,7 +1281,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Idi"
@@ -1272,7 +1290,7 @@ msgstr "Idi"
 msgid "Going to send questionnaire?"
 msgstr "Pošalji upitnik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1332,8 @@ msgstr "Zdravo %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1376,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.⏎\n"
 
@@ -1404,6 +1422,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1485,7 @@ msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vr
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1521,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1529,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr "Nevažeća odgovorna_vrijednost agencije %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Nevažeći datum završetka"
 
@@ -1515,16 +1537,16 @@ msgstr "Nevažeći datum završetka"
 msgid "Invalid format %s specified."
 msgstr "Naveden nevažeći %s format."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Nevažeći datum početka"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1592,11 @@ msgstr "Posljednje ažuriranje"
 msgid "Last&nbsp;update:"
 msgstr "Posljednje&nbsp;ažuriranje:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1641,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1669,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Poruka"
 
@@ -1659,7 +1689,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Nedostaje nadležni_ID"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1697,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1709,7 @@ msgstr ""
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1733,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ime"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1745,7 @@ msgstr "Ime:"
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1817,7 +1847,7 @@ msgstr "Novo stanje"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1832,7 +1862,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1853,7 +1883,7 @@ msgstr ""
 msgid "No council"
 msgstr "Nema odgovornog tijela"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Nije odabrano odgovorno tijelo"
 
@@ -1913,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1991,15 +2021,15 @@ msgstr "Starije <br>popravljeno"
 msgid "Older <br>problems"
 msgstr "Stariji <br>problemi"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2045,13 +2075,13 @@ msgstr "Ili problemi prijavljeni:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća &rsquo;:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2072,7 +2102,7 @@ msgid "Parent"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Djelomično"
 
@@ -2106,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonski broj (neobavezan)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2158,7 +2188,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2186,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr "Provjerite je li vaša e-mail adresa točna"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Izaberi kategoriju"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Izaberi tip imovine"
 
@@ -2214,13 +2244,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Unesi poruku"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2235,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "Unesi lozinku"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Unesi predmet"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2254,7 +2284,7 @@ msgstr "Unesi valjani e-mail"
 msgid "Please enter a valid email address"
 msgstr "Unesi valjanu e-mail adresu"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Unesi detalje"
@@ -2287,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2325,7 +2355,7 @@ msgstr "Popunite detalje o problemu u nastavku."
 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 "Popunite detalje o problemu u nastavku i opišite lokaciju što preciznije."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Molimo navedite želite li primiti novi upitnik"
 
@@ -2351,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Napominjemo:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Molimo unesite tekst i fotografiju "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu"
 
@@ -2380,7 +2410,7 @@ msgstr "Izaberite izvor koji želite"
 msgid "Please select the type of alert you want"
 msgstr "Izaberite tip upozorenja koji želite"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Navedite je li problem rješen  "
 
@@ -2399,22 +2429,22 @@ msgstr "Napiši poruku"
 msgid "Please write your update here"
 msgstr "Ovdje ažurirajte"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Objavi"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Objavljeno anonimno na %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Objavio %s (<strong>%s</strong>) na %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Objavio %s na %s"
 
@@ -2430,7 +2460,8 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2446,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privatno"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privatno"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2485,11 +2521,11 @@ msgstr "Stanje problema izmijenjeno na temelju rezultata ankete"
 msgid "Problems"
 msgstr "Problemi"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Okolni problemi"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemi na mapi"
 
@@ -2501,7 +2537,7 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemi unutar%.1fkm od ove lokacije"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2525,6 +2561,7 @@ msgstr "Problemi unutar granice:"
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Ažuriranje"
@@ -2542,12 +2579,16 @@ msgstr ""
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2571,7 +2612,7 @@ msgstr " Upitnik %d odgovren za problem %d, %s za %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Upitnik %d poslan za problem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Upitnik popunila osoba koja je prijavila problem"
 
@@ -2579,7 +2620,7 @@ msgstr "Upitnik popunila osoba koja je prijavila problem"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS izvor"
 
@@ -2607,7 +2648,7 @@ msgstr "RSS izvor za %s, unutar %s ward"
 msgid "RSS feed of nearby problems"
 msgstr "RSS izvor za okolne probleme"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2623,12 +2664,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS izvor za nedavne lokalne probleme"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS izvor za ažuriranja ovog problema"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Primite e-mail s ažuriranjima ovog problema"
 
@@ -2650,7 +2691,7 @@ msgstr "Nedavno<br>popravljeno"
 msgid "Recently reported problems"
 msgstr "Nedavno prijavljeni problemi"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2658,13 +2699,15 @@ 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 izvještavanje fizičkih problema koji se mogu popraviti. Ako vaš problem nije prikladan za prijavljivanje preko ove stranice, uvijek se možete obratiti direktno svom vijeću preko njihove web stranice."
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Ukloni oznaku"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2672,7 +2715,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2686,7 +2729,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2696,6 +2740,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Prijavi problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Prijavi zloupotrebu"
@@ -2719,8 +2764,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Prijavljeno anonimno %s"
 
@@ -2729,8 +2774,8 @@ msgstr "Prijavljeno anonimno %s"
 msgid "Reported before"
 msgstr "Prije prijavljeno"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Prijavio %s za %s"
 
@@ -2743,27 +2788,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Prijavljeno %s u kategoriju anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Prijavio %s u kategoriju %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Prijavio %s anonimno %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Prijavio %s %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Prijavio %s u %s kategoriju %s u %s"
 
@@ -2873,16 +2918,16 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Cestovni operater za ovu imenovanu cestu  (sa OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2893,21 +2938,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Spremi promjene"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2944,6 +2993,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2987,27 +3040,27 @@ msgstr "Poslano:"
 msgid "Service:"
 msgstr "Servis:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Podijeli"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3079,7 +3132,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3127,12 +3180,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stanje"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3172,7 +3227,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Predmet"
 
@@ -3189,7 +3244,7 @@ msgstr "Predmet:"
 msgid "Submit"
 msgstr "Pošalji"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3215,7 +3270,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Pretplati se"
 
@@ -3486,7 +3541,7 @@ msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte po
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3568,9 +3623,9 @@ msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma od
 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 ukoliko niste nadležni za ovaj problem."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Potrebna informacija"
@@ -3595,6 +3650,10 @@ msgstr "Problem je riješen"
 msgid "This problem has not been fixed"
 msgstr "Problem još nije riješen"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3669,7 +3728,8 @@ msgstr "Karta točne lokacije ovog problema"
 msgid "Total"
 msgstr "Ukupno"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3677,7 +3737,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3694,14 +3754,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3721,8 +3781,8 @@ msgstr "Nepoznato"
 msgid "Unknown alert type"
 msgstr "Nepoznat tip upozorenja"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3733,6 +3793,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr "Nepoznat IB problema"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Ažuriranje"
@@ -3786,7 +3850,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3801,7 +3865,7 @@ msgstr "Ažurirano!"
 msgid "Updates"
 msgstr "Ažuriranja"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3832,11 +3896,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Korisnička oznaka uklonjena"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Korisnik označen"
 
@@ -3845,7 +3909,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3935,6 +3999,10 @@ msgstr "Prilikom ažuriranja"
 msgid "When sent"
 msgstr "Prilikom slanja"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3983,7 +4051,7 @@ msgstr "Godina"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3998,11 +4066,11 @@ msgstr "Da"
 msgid "Yes I have a password"
 msgstr "Da, imam lozinku"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:"
 
@@ -4019,7 +4087,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4110,9 +4178,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4132,7 +4200,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Vaše informacije će se koristiti isključivo u skladu s našim<a href=\"/privacy\">pravilima o privatnosti</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4211,53 +4279,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr "od %s različitih korisnika"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "manje od minute"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "označeno kao popravljeno"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4303,8 +4371,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "druga područja:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "ponovno otvoreno"
 
@@ -4350,15 +4418,15 @@ msgstr "korisnik je vlasnik problema"
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> novija prijava"
-msgstr[1] "<big>%s</big> novije prijave"
-msgstr[2] "<big>%s</big> novije prijave"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dan"
+msgstr[1] "%d dani"
+msgstr[2] "%d dani"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4366,15 +4434,7 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sati"
 msgstr[2] "%d sati"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4382,23 +4442,15 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minute"
 msgstr[2] "%d minute"
 
-#: 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] "<big>%s</big> ažuriranje za prijavu"
-msgstr[1] "<big>%s</big> ažuriranja za prijavu"
-msgstr[2] "<big>%s</big> ažuriranja za prijavu"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokaciju."
-msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
-msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4406,6 +4458,14 @@ msgstr[0] "%d tjedan"
 msgstr[1] "%d tjedni"
 msgstr[2] "%d tjedni"
 
+#: 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] "<big>%s</big> popravljeno u posljednjih mjesec dana"
+msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana"
+msgstr[2] "<big>%s</big> popravljeno u posljednjih mjesec dana"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4414,21 +4474,21 @@ 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> prijave u prošlom tjednu"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-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> popravljeno u posljednjih mjesec dana"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> novija prijava"
+msgstr[1] "<big>%s</big> novije prijave"
+msgstr[2] "<big>%s</big> novije prijave"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dan"
-msgstr[1] "%d dani"
-msgstr[2] "%d dani"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> ažuriranje za prijavu"
+msgstr[1] "<big>%s</big> ažuriranja za prijavu"
+msgstr[2] "<big>%s</big> ažuriranja za prijavu"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4437,3 +4497,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] "Još <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje je odgovorno za ovu lokaciju."
 msgstr[1] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
 msgstr[2] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
+
+#: 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] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokaciju."
+msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
+msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
index d743e11f9..d9c57a9be 100644
--- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/it.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "e"
@@ -110,7 +110,7 @@ msgstr "%s quartiere, %s"
 msgid "%s, within %s ward"
 msgstr "%s dentro al quartiere %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Email nella tabella degli abusi)"
@@ -142,12 +142,10 @@ msgstr "(una distanza predefinita che copre approssimativamente 200,000 persone)
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(chiuso)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(risolto)"
@@ -156,7 +154,7 @@ msgstr "(risolto)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(non inviato al Comune)"
 
@@ -164,21 +162,21 @@ msgstr "(non inviato al Comune)"
 msgid "(optional)"
 msgstr "(opzionale)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(inviato ad entrambi)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Scegli una categoria --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Scegli un tipo di proprietà --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>No</strong> Lasciami confermare il mio aggiornamento via email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong> lasciami entrare con l'email"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Si</strong> Ho già la password"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "Aggiungi un corpo"
 msgid "Add new category"
 msgstr "Aggiungi una nuova categoria"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Aggiungi un'utente"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Aggiunti %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "Un aggiornamento ha riportato questo problema come risolto."
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonimo:"
@@ -399,7 +400,7 @@ msgstr "Assegna ad un corpo esterno:"
 msgid "Assign to subdivision:"
 msgstr "Assegna ad una subdivisione:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr "Indietro"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Vietare l'indirizzo email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Contatta il team"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Non posso trovare l'utente"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Non lo so"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplica"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplica"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplica"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "Modifica"
 msgid "Edit body details"
 msgstr "Modifica dettagli corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email aggiunta alla lista abusi"
 
@@ -991,11 +1009,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Email già presente nella lista abusi"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "Inserisci i dettagli del problema"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "Esempio codice postale %s"
 msgid "Examples:"
 msgstr "Esempi:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dati extra:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr "Risolto"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Risolto - Comune"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Risolto - Utente"
 
@@ -1178,7 +1198,7 @@ msgstr "Risolto:"
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Utente segnalato"
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Segnalato:"
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "Domande Frequenti"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Ottieni aggiornamenti "
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Vai"
@@ -1272,7 +1292,7 @@ msgstr "Vai"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "Ciao %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n"
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr ""
 
@@ -1515,16 +1539,16 @@ msgstr ""
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "Ultimo aggiornamento:"
 msgid "Last&nbsp;update:"
 msgstr "Ultimo&nbsp;aggiornamento:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr "MAPPA"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Mappa"
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Messaggio"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr ""
 msgid "Month"
 msgstr "Mese"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "Nome:"
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr "Nuovo stato"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr "Prossimo"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr "Nessun corpo"
 msgid "No council"
 msgstr "Nessuno comune"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Nessun comune selezionato"
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr "Più vecchi <br> risolti"
 msgid "Older <br>problems"
 msgstr "Vecchi <br>problemi"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr "Parente"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Parziale"
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "Numero di telefono (opzionale)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr "Inserisci il cursore sulla mappa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr "Per favore controlla che il tuo indirizzo email è corretto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Per favore scegli una categoria"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Per favore scegli un tipo di proprietà"
 
@@ -2212,13 +2244,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Per favore inserisci un messaggio"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "Per favore inserisci la password"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Per favore inserisci il soggetto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr "Per favore inserire un email valida"
 msgid "Please enter a valid email address"
 msgstr "Per favore inserire un indirizzo email valido"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Per favore inserire qualche dettaglio "
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr "SI prega di inserire i dettagli del problema"
 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 "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Per favore indicare se si vuole ricevere un altro questionario"
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Attenzione:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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 "
 
@@ -2378,7 +2410,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Si prega di indicare se il problema è stato risolto"
 
@@ -2397,22 +2429,22 @@ msgstr "Per favore scrivi un messaggio"
 msgid "Please write your update here"
 msgstr "Per favore scrivi il tuo aggiornamento qui"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Posta"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Postato anonimamente al %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Postato da %s  (<strong>%s</strong>) al %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postato da %s al %s"
 
@@ -2428,7 +2460,8 @@ msgstr "Precedente"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privato"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privato"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problema"
@@ -2483,11 +2521,11 @@ msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio"
 msgid "Problems"
 msgstr "Problemi"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemi vicino"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemi sulla mappa"
 
@@ -2499,7 +2537,7 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr "Problemi dentro i confini di:"
 msgid "Property address:"
 msgstr "L'indirizzo della proprietà:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Fornisci un'aggiornamento"
@@ -2540,12 +2579,17 @@ msgstr ""
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Risposte pubbliche:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Risposte pubbliche:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2613,7 @@ msgstr "Questionario %d e risposte per il problema %d, %s o %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Questionario %d inviato per il problema %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2621,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS feed"
 
@@ -2605,7 +2649,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2665,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS feed dei recenti problemi locali"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed degli aggiornamenti su questa segnalazione"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione."
 
@@ -2648,7 +2692,7 @@ msgstr "Recentemente <br>risolti"
 msgid "Recently reported problems"
 msgstr "Problemi segnalati di recente"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2700,15 @@ 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 "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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2716,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2730,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2741,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Segnala un problema"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Segnala un abuso"
@@ -2717,8 +2765,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Segnala, conosci e discuti sui problemi della tua città "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Riportati anonimamente al %s"
 
@@ -2727,8 +2775,8 @@ msgstr "Riportati anonimamente al %s"
 msgid "Reported before"
 msgstr "Segnalati prima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Segnalato da %s al %s"
 
@@ -2741,27 +2789,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Riportato nella categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Riportato nella categoria %s anonimamente alle %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2871,16 +2919,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2939,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Salva modifiche"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2994,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3041,27 @@ msgstr "Inviato:"
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Condividi"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3133,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3181,14 @@ msgstr "Data di inizio:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stato"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3228,7 @@ msgstr "Sottocategoria: %s"
 msgid "Subdivision/Body"
 msgstr "Sottodivisione/Corpo"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Soggetto"
 
@@ -3187,7 +3245,7 @@ msgstr "Soggetto:"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3271,7 @@ msgid "Submitted"
 msgstr "Inviato"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
@@ -3484,7 +3542,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3624,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Questa informazione è richiesta"
@@ -3593,6 +3651,10 @@ msgstr "Questo problema è stato risolto"
 msgid "This problem has not been fixed"
 msgstr "Questo problema non è stato risolto"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3729,8 @@ msgstr ""
 msgid "Total"
 msgstr "Totale"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3738,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3755,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3782,8 @@ msgstr "Sconosciuto"
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
@@ -3731,6 +3794,10 @@ msgstr "Errore sconosciuto"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3784,7 +3851,7 @@ msgid "Updated"
 msgstr "Aggiornato"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3866,7 @@ msgstr "Aggiornato!"
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3897,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3910,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +4000,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4052,7 @@ msgstr "Anno"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4067,11 @@ msgstr "Si"
 msgid "Yes I have a password"
 msgstr "Si ho già la password"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4088,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4108,9 +4179,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4201,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4280,53 @@ msgstr "Modifica utente"
 msgid "from %s different users"
 msgstr "da %s utenti differenti"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultimo aggiornamento %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "meno di un minuto"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4301,8 +4372,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "altre aree:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "riaperto"
 
@@ -4348,55 +4419,48 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d giorno"
+msgstr[1] "%d giorni"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] ""
-msgstr[1] ""
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
-#: 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] "<big>%s</big> aggiornamento sulle segnalazioni"
-msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Non abbiamo ancora i dettagli sul comune che copre questa zona."
-msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
+#: 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] "<big>%s</big> risolti nel mese passato"
+msgstr[1] "<big>%s</big> risolti nel mese passato"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4404,19 +4468,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d giorno"
-msgstr[1] "%d giorni"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni"
+msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4424,3 +4488,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona."
 msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona."
+
+#: 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] "Non abbiamo ancora i dettagli sul comune che copre questa zona."
+msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona."
diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
index 737e89639..872be63b9 100644
--- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/lt_LT.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paulius Zaleckas <paulius.zaleckas@gmail.com>, 2017\n"
 "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "ir"
@@ -110,7 +110,7 @@ msgstr "%s rajonas, %s"
 msgid "%s, within %s ward"
 msgstr "%s, viduje %s rajonas"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Elektroninis paštas piktnaudžiavo lentelėje)"
@@ -142,12 +142,10 @@ msgstr "(numatytasis atstumas, kuris apima maždaug 200.000 žmonių)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(uždaryta)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(atlikta)"
@@ -156,7 +154,7 @@ msgstr "(atlikta)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietimas)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(neišsiųsta savivaldybei)"
 
@@ -164,21 +162,21 @@ msgstr "(neišsiųsta savivaldybei)"
 msgid "(optional)"
 msgstr "(pasirinktinai)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(išsiųsta į abu)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Išsirinktite kategorija --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Pasirinkite nuosavybės tipą --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Išsirinkinte šabloną--"
 
@@ -197,8 +195,8 @@ msgstr ""
 "Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).<br>\n"
 "Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimą el. paštu"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ne</strong> leisti man prisijungti el. paštu"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 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."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong>Pastaba:</strong> Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti."
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Taip</strong> Aš turiu slaptažodį"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -268,26 +266,29 @@ msgstr "pridėti instituciją"
 msgid "Add new category"
 msgstr "Pridėti naują kategoriją"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Įdėti į trumpajį sąrašą"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Pridėti vartotoją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Pridėti/redaguoti problemų kategorijas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Pridėti/redaguoti atsakymų prioritetus"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Pridėti/redaguoti atsakymo šablonus"
 
@@ -295,7 +296,7 @@ msgstr "Pridėti/redaguoti atsakymo šablonus"
 msgid "Added %s"
 msgstr "Pridėta %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -350,7 +351,7 @@ msgstr "Atnaujinimas - Problema sutvarkyta"
 msgid "Anonymous"
 msgstr "Anoniminis"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anoniminis:"
@@ -405,7 +406,7 @@ msgstr "Priskirti išoriniai institucijai:"
 msgid "Assign to subdivision:"
 msgstr "Priskirti padaliniui:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -430,8 +431,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -439,7 +440,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Laukiama "
@@ -452,12 +453,12 @@ msgstr "Atgal"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Drausti el. paštą"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -488,10 +489,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nematote žemėlapio? <em>Praleiskite šitą žingsnį</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -504,7 +501,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -524,7 +522,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -600,6 +598,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -628,10 +630,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -733,8 +736,8 @@ msgstr "Susisiekite su komanda"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Vartotojas nerastas"
 
@@ -788,7 +791,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Sukurti šabloną"
@@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Padalinys atliko per 5 darbo dienas"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Pašalinti šabloną"
@@ -895,21 +898,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Don&rsquo;t nežinau"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Nepatinka anketos?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Kopija"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Kopija"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Kopija"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -921,7 +938,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -940,11 +958,11 @@ msgstr "Redaguoti"
 msgid "Edit body details"
 msgstr "Redaguoti institucijos informaciją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -995,7 +1013,7 @@ msgstr "Redaktorius"
 msgid "Email"
 msgstr "El. paštas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo"
 
@@ -1013,11 +1031,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "El. paštas jau yra piktnaudžiavimo sąraše"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1091,7 +1109,7 @@ msgid "Enter details of the problem"
 msgstr "įveskite problemos detales"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1113,8 +1131,8 @@ msgstr "Pašto kodo pavyzdys %s"
 msgid "Examples:"
 msgstr "Pavyzdžiai:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1150,7 +1168,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Papildoma informacija:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1172,11 +1191,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Suvarkyti tai pasirenkant <strong>pažymėta vietovę</strong>  <em>Redaguoti informaciją</em>formą."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1184,12 +1204,12 @@ msgid "Fixed"
 msgstr "Sutvarkyta"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Sutvarkyta - Savivaldybe"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Sutvarkyta - Vartotojas"
 
@@ -1207,7 +1227,7 @@ msgstr "Sutvarkyta:"
 msgid "Flag as deleted"
 msgstr "Pažymeti kaip ištrinta"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Pažymėti vartotoją"
 
@@ -1228,7 +1248,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Pažymėta:"
@@ -1266,7 +1286,7 @@ msgid "Frequently Asked Questions"
 msgstr "Dažniausiai Užduodami Klausimai"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Gauti atnaujinimus"
 
@@ -1292,7 +1312,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Pirmyn"
@@ -1301,7 +1321,7 @@ msgstr "Pirmyn"
 msgid "Going to send questionnaire?"
 msgstr "Ar ruošiates išsiųsti klausimyną?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1343,8 +1363,8 @@ msgstr "Labas %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1387,7 +1407,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n"
 
@@ -1437,6 +1457,10 @@ 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/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1504,7 +1528,7 @@ msgstr "In addition, the following attributes that are not part of the Open311 v
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1540,7 +1564,7 @@ msgid "Internal notes"
 msgstr "Internal notes"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Internal referral"
 
@@ -1548,7 +1572,7 @@ msgstr "Internal referral"
 msgid "Invalid agency_responsible value %s"
 msgstr "Invalid agency_responsible value %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Klaidina pabaigos data"
 
@@ -1556,16 +1580,16 @@ msgstr "Klaidina pabaigos data"
 msgid "Invalid format %s specified."
 msgstr "Pasirinktas klaidingas formatas %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Klaidinga pradžios data"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1611,7 +1635,11 @@ msgstr "Paskutinis atnaujinimas:"
 msgid "Last&nbsp;update:"
 msgstr "Last&nbsp;update:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1656,6 +1684,10 @@ msgstr "MAP"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Žemėlapis"
@@ -1680,7 +1712,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Žinutė"
 
@@ -1700,7 +1732,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Missing jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1708,7 +1740,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1720,7 +1752,7 @@ msgstr "Moderated by division within one working day"
 msgid "Month"
 msgstr "Mėnuo"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1744,7 +1776,7 @@ msgstr ""
 msgid "Name"
 msgstr "Vardas"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1756,7 +1788,7 @@ msgstr "Vardas:"
 msgid "Name: %s"
 msgstr "Vardas: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1858,7 +1890,7 @@ msgstr "New state"
 msgid "New template"
 msgstr "Naujas šablonas"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1873,7 +1905,7 @@ msgstr "Kitas"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1894,7 +1926,7 @@ msgstr "Nėra institucijos"
 msgid "No council"
 msgstr "Nėra savivaldybės"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Nepasirinkta savivaldybė"
 
@@ -1960,7 +1992,7 @@ msgstr ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2038,15 +2070,15 @@ msgstr "Senesnis <br>sutvarkyta"
 msgid "Older <br>problems"
 msgstr "Senesnės <br>problemos"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2092,13 +2124,13 @@ msgstr "Arba problemos praneštos:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Arba jūs galite prenumeruoti įspėjimą atsižvelgiant į jūsų rajoną arba savivaldybę:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2119,7 +2151,7 @@ msgid "Parent"
 msgstr "Parent"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Dalinis"
 
@@ -2153,7 +2185,7 @@ msgid "Phone number (optional)"
 msgstr "Telefono numeris (nebūtina)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2205,7 +2237,7 @@ msgstr "Padėkite smeigtuką ant žemėlapio"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2233,14 +2265,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Prašome pasirinkti kategoriją"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Prašome pasirinkti nuosavybės tipą"
 
@@ -2261,13 +2293,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Prašome įvesti žinutę"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2282,13 +2314,13 @@ msgid "Please enter a password"
 msgstr "Prašome įvesti slaptažodį"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Prašome įvesti temą"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2301,7 +2333,7 @@ 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/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Prašome įvesti daugiau informacijos"
@@ -2334,8 +2366,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2372,7 +2404,7 @@ msgstr "Prašome užpildyti problemos detales."
 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 "Prašome pateikti problemos detales žemiau esančioje anketoje ir kuo tiksliau apibūdinkite vietą."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Prašome nurodyti, ar norite gauti kitą klausimyną."
 
@@ -2398,20 +2430,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Atkreipkite dėmėsį:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2427,7 +2459,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Prašome nurodyti, ar problema buvo sutvarkyta"
 
@@ -2446,22 +2478,22 @@ msgstr "Prašome įvesti žinutę"
 msgid "Please write your update here"
 msgstr "Prašome raštyti savo naujinimą čia"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Įkelti"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Pateikta anonimiškai %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -2477,7 +2509,8 @@ msgstr "Ankstesnis"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2493,10 +2526,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privatus"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privatus"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problema"
@@ -2532,11 +2570,11 @@ msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais"
 msgid "Problems"
 msgstr "Problemos"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Šalia esančios problemos"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemos žemėlapyje"
 
@@ -2548,7 +2586,7 @@ msgstr "Neseniai praneštos problemos FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemos %.1fkm atstumu aplink šią vietovę"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2572,6 +2610,7 @@ msgstr "Problemos apibrėžtose ribose:"
 msgid "Property address:"
 msgstr "Nuosavybės adresas:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Pateikti naujinimą"
@@ -2589,12 +2628,17 @@ msgstr "Pateikti vardą ir slaptažodį yra nebūtina, tačiau pateiktus bus jum
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Viešas atsakymas:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Viešas atsakymas:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2618,7 +2662,7 @@ msgstr "Atsakyta anketa %d skirta problemoms %d, %s to %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Anketa %d išsiųsta dėl problemos %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Questionnaire filled in by problem reporter"
 
@@ -2626,7 +2670,7 @@ msgstr "Questionnaire filled in by problem reporter"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS srautas"
 
@@ -2654,7 +2698,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2670,12 +2714,12 @@ msgid "RSS feed of recent local problems"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -2697,7 +2741,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2705,13 +2749,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2719,7 +2765,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2733,7 +2779,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2743,6 +2790,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2766,8 +2814,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2776,8 +2824,8 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2790,27 +2838,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2920,16 +2968,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2940,21 +2988,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2991,6 +3043,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3034,27 +3090,27 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3126,7 +3182,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3174,12 +3230,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3219,7 +3277,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -3236,7 +3294,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3262,7 +3320,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3533,7 +3591,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3615,9 +3673,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr ""
@@ -3642,6 +3700,10 @@ msgstr ""
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3716,7 +3778,8 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3724,7 +3787,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3741,14 +3804,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3768,8 +3831,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3780,6 +3843,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3833,7 +3900,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3848,7 +3915,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3879,11 +3946,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3892,7 +3959,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3982,6 +4049,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4030,7 +4101,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4045,11 +4116,11 @@ msgstr ""
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4066,7 +4137,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4157,9 +4228,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4179,7 +4250,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4258,53 +4329,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr ""
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4350,8 +4421,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -4397,15 +4468,15 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4413,15 +4484,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4429,26 +4492,26 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/front/stats.html:25
+#: templates/web/base/report/_support.html:6
 #, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
+msgid "%d supporter"
+msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/report/new/top_message_none.html:3
+#: perllib/Utils.pm:221
 #, 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."
+msgid "%d week"
+msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:220
+#: templates/web/base/front/stats.html:19
 #, perl-format
-msgid "%d week"
-msgid_plural "%d weeks"
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -4461,18 +4524,18 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -4484,3 +4547,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: 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[2] ""
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0789a37a5..00d05d918 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " dan "
@@ -110,7 +110,7 @@ msgstr "%s kawasan pentadbiran, %s"
 msgid "%s, within %s ward"
 msgstr "%s, dalam kawasan pentadbiran %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Emel dalam jadual penyalahguna)"
@@ -142,12 +142,10 @@ msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(ditutup)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(tetap)"
@@ -156,7 +154,7 @@ msgstr "(tetap)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(tidak dihantar kepada majlis)"
 
@@ -164,21 +162,21 @@ msgstr "(tidak dihantar kepada majlis)"
 msgid "(optional)"
 msgstr "(tidak diwajibkan)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(hantar kepada kedua-dua)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Pilih kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Pilih jenis harta --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -197,8 +195,8 @@ msgstr ""
 "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
 "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ya</strong> Aku ada kata laluan"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -265,26 +263,29 @@ msgstr "Tambah badan"
 msgid "Add new category"
 msgstr "Tambah kategori baru"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Tambah pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -292,7 +293,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "%s telah ditambahi"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -347,7 +348,7 @@ msgstr "Ada kemas kini menanda masalah ini sebagai diselesai."
 msgid "Anonymous"
 msgstr "Tanpa nama"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Tanpa Nama:"
@@ -402,7 +403,7 @@ msgstr "Ditugaskan kepada badan luaran:"
 msgid "Assign to subdivision:"
 msgstr "Ditugaskan kepada bahagian bawah:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -427,8 +428,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -436,7 +437,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Mengunggu penyederhanaan"
@@ -449,12 +450,12 @@ msgstr "Balik"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Melarang alamat emel"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -485,10 +486,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -501,7 +498,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -521,7 +519,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Kategori rata masalah diselesai > 4 minggu"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -584,6 +582,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -612,10 +614,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -717,8 +720,8 @@ msgstr "Menghubungi pasukan"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Tidak dapat mencari pengguna"
 
@@ -772,7 +775,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -813,7 +816,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -879,21 +882,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Tidak tahu"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Salinan"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Salinan"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Salinan"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -902,7 +919,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -921,11 +939,11 @@ msgstr "Menyunting"
 msgid "Edit body details"
 msgstr "Edit perincian badah"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -976,7 +994,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Emel"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Emel ditambahkan kepada senarai penyalahguna"
 
@@ -994,11 +1012,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Emel telah dalam senarai penyalahguna"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1065,7 +1083,7 @@ msgid "Enter details of the problem"
 msgstr "Masukkan perincian masalah tersebut"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1087,8 +1105,8 @@ msgstr "Contoh poskod %s"
 msgid "Examples:"
 msgstr "Contoh:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1124,7 +1142,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Data tambahan:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1146,11 +1165,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1158,12 +1178,12 @@ msgid "Fixed"
 msgstr "Diselesai"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Diselesai - Majlis"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Diselesai - Pengguna"
 
@@ -1181,7 +1201,7 @@ msgstr "Selesai:"
 msgid "Flag as deleted"
 msgstr "Tanda sebagai dipadam"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Tanda pengguna"
 
@@ -1202,7 +1222,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Ditanda:"
@@ -1240,7 +1260,7 @@ msgid "Frequently Asked Questions"
 msgstr "Soalan lazim"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Dapatkan kemas kini"
 
@@ -1266,7 +1286,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Pergi"
@@ -1275,7 +1295,7 @@ msgstr "Pergi"
 msgid "Going to send questionnaire?"
 msgstr "Teruskan dengan menghantar soalan selidik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1317,8 +1337,8 @@ msgstr "Hi %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1361,7 +1381,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
 
@@ -1407,6 +1427,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1466,7 +1490,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1502,7 +1526,7 @@ msgid "Internal notes"
 msgstr "Nota dalaman"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Rujukan dalaman"
 
@@ -1510,7 +1534,7 @@ msgstr "Rujukan dalaman"
 msgid "Invalid agency_responsible value %s"
 msgstr "Nilai agency_responsible %s salah"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Tarikh berakhir yang tak sah"
 
@@ -1518,16 +1542,16 @@ msgstr "Tarikh berakhir yang tak sah"
 msgid "Invalid format %s specified."
 msgstr "Format dinyatakan %s salah"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Tarikh mula yang tak sah"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1573,7 +1597,11 @@ msgstr "Kemas kini terakhir:"
 msgid "Last&nbsp;update:"
 msgstr "Kemas kini terakhir:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1618,6 +1646,10 @@ msgstr "PETA"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1642,7 +1674,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Pesanan"
 
@@ -1662,7 +1694,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Kehilangan jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1670,7 +1702,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1682,7 +1714,7 @@ msgstr ""
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1706,7 +1738,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nama"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1718,7 +1750,7 @@ msgstr "Nama:"
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1818,7 +1850,7 @@ msgstr "Negeri baru"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1833,7 +1865,7 @@ msgstr "Seterusnya"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1854,7 +1886,7 @@ msgstr "Tiada badan"
 msgid "No council"
 msgstr "Tiada majlis"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Tiada majlis dipilihi"
 
@@ -1914,7 +1946,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1994,15 +2026,15 @@ msgstr "Lebih tua<br>diselesai"
 msgid "Older <br>problems"
 msgstr "Lebih tua <br>masalah"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2048,13 +2080,13 @@ msgstr "Atau masalah dilaporkan kepada:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2075,7 +2107,7 @@ msgid "Parent"
 msgstr "Induk"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Separa"
 
@@ -2109,7 +2141,7 @@ msgid "Phone number (optional)"
 msgstr "Nombor telefon (tidak diwajibkan)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2161,7 +2193,7 @@ msgstr "Letakkan pin atas peta"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2189,14 +2221,14 @@ msgid "Please check your email address is correct"
 msgstr "Sila periksa sama ada alamat emel anda adalah betul"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Sila pilihkan kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Sila pilihkan jenis bangunan"
 
@@ -2217,13 +2249,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Sila masukkan pesanan"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2238,13 +2270,13 @@ msgid "Please enter a password"
 msgstr "Sila masukkan kata laluan"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Sila masukkan tajuk"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2257,7 +2289,7 @@ msgstr "Silah masukkan emel yang benar"
 msgid "Please enter a valid email address"
 msgstr "Sila masukkan alamat emel yang benah"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Sila masukkan perincian"
@@ -2290,8 +2322,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2328,7 +2360,7 @@ msgstr "Sila isikan perincian untuk masalah tersebut"
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2354,20 +2386,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Sila  nota:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2383,7 +2415,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -2402,22 +2434,22 @@ msgstr "Sila tuliskan pesanan"
 msgid "Please write your update here"
 msgstr "Sila tuliskan kemas kini anda di sini"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Post"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Post tanpa nama pada %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Dipostkan oleh %s (<strong>%s</strong>) pada %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Dipostkan oleh %s pada %s"
 
@@ -2433,7 +2465,8 @@ msgstr "Sebelumnya"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2449,10 +2482,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Peribadi"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Peribadi"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Masalah"
@@ -2488,11 +2526,11 @@ msgstr ""
 msgid "Problems"
 msgstr "Masalah-masalah"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Masalah terdekat"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Masalah atas peta"
 
@@ -2504,7 +2542,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
 msgid "Problems within %.1fkm of this location"
 msgstr "Masalah dalam %.1fkm dalam lokasi ini"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2528,6 +2566,7 @@ msgstr "Masalah dalam sempadan"
 msgid "Property address:"
 msgstr "Alamat bangunan"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Sediakan kemas kini"
@@ -2545,12 +2584,17 @@ msgstr ""
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Tindak balas awam:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Tindak balas awam:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2574,7 +2618,7 @@ msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Soalan selidik %d dihantar untuk masalah %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Soalan selidik diisikan oleh pelapor masalah"
 
@@ -2582,7 +2626,7 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "Feed RSS"
 
@@ -2610,7 +2654,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2626,12 +2670,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Feed RSS untuk masalah tempatan baru-baru ini"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Feed RSS untuk kemas kini bagi masalah ini"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
 
@@ -2653,7 +2697,7 @@ msgstr "Diselesai <br>baru-baru ini"
 msgid "Recently reported problems"
 msgstr "Masalah yang dilaporkan baru-baru ini"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2661,13 +2705,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2675,7 +2721,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2689,7 +2735,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2699,6 +2746,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2722,8 +2770,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2732,8 +2780,8 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2746,27 +2794,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2876,16 +2924,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2896,21 +2944,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "ditanda sebagai laporan salinan"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2947,6 +3000,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2990,27 +3047,27 @@ msgstr "Dihantar:"
 msgid "Service:"
 msgstr "Servis:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Kongsi"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3082,7 +3139,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3130,12 +3187,14 @@ msgstr "Tarikh bermula:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Negeri"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3175,7 +3234,7 @@ msgstr "Subkategori: %s"
 msgid "Subdivision/Body"
 msgstr "Bahagian bawah/Badan"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Tajuk"
 
@@ -3192,7 +3251,7 @@ msgstr "Tajuk:"
 msgid "Submit"
 msgstr "Hantar"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3218,7 +3277,7 @@ msgid "Submitted"
 msgstr "Dihantarkan"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Melanggan"
 
@@ -3489,7 +3548,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3571,9 +3630,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr ""
@@ -3598,6 +3657,10 @@ msgstr "Masalah ini telah diselesai"
 msgid "This problem has not been fixed"
 msgstr "Masalah ini belum diselesai"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3672,7 +3735,8 @@ msgstr "Melihat lokasi tepat atas peta bagi isu ini"
 msgid "Total"
 msgstr "Jumlah"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3680,7 +3744,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3697,14 +3761,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Tidak dapat diselesai"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3724,8 +3788,8 @@ msgstr "Tidak diketahui"
 msgid "Unknown alert type"
 msgstr "Jenis pemberitahuan tak diketahui"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Ralat tidak diketahui"
@@ -3736,6 +3800,10 @@ msgstr "Ralat tidak diketahui"
 msgid "Unknown problem ID"
 msgstr "ID masalah tidak diketahui"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Kemas kini"
@@ -3789,7 +3857,7 @@ msgid "Updated"
 msgstr "Dikemas kinikan"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3804,7 +3872,7 @@ msgstr "Dikemas kinikan!"
 msgid "Updates"
 msgstr "Kemas kini"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3835,11 +3903,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Tanda pengguna dipadam"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Pengguna ditanda"
 
@@ -3848,7 +3916,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3938,6 +4006,10 @@ msgstr "Bila diedit"
 msgid "When sent"
 msgstr "Bila dihantar"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3986,7 +4058,7 @@ msgstr "Tahun"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4001,11 +4073,11 @@ msgstr "Ya"
 msgid "Yes I have a password"
 msgstr "Ya aku ada kata laluan"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4022,7 +4094,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4116,9 +4188,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4138,7 +4210,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4217,53 +4289,53 @@ msgstr "edit pengguna"
 msgid "from %s different users"
 msgstr "dari %s pengguna lain"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "kemaskini yang lepas %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "kurang dari seminit"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "ditanda sebagai laporan salinan"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "ditanda sebagai tindakan dijadualkan"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "ditanda sebagai rujukan dalaman"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "ditanda sebagai ditutupi"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "ditanda sebagai diselesai"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "ditanda sebagai dijalani"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "ditanda sebagai disiasati"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "ditanda sebagai bukan tanggungjawab majlis"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "ditanda sebagai dijadual"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "ditanda sebagai tak boleh dibaiki"
 
@@ -4309,8 +4381,8 @@ msgstr "pemasukan asal: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "kawasan lain:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "dibuka semula"
 
@@ -4356,68 +4428,68 @@ msgstr "pengguna adalah pemilik masalah"
 msgid "ward"
 msgstr "kawasan pentadbiran"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> laporan baru-baru ini"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d hari"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d penyokong"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minit"
 
-#: 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] "<big>%s</big> laporan dikemaskini"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d penyokong"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d minggu"
 
+#: 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] "<big>%s</big> diselesai di bulan lepas"
+
 #: 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-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"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> laporan baru-baru ini"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d hari"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> laporan dikemaskini"
 
 #: 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] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini."
+
+#: 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] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
index a0d1d90a2..428e50600 100644
--- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "ႏွင့္"
@@ -110,7 +110,7 @@ msgstr "%sရပ္ကြက္၊ %s"
 msgid "%s, within %s ward"
 msgstr "%s၊ %s ရပ္ကြက္အတြင္း"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(ရိုင္းစိုင္းစြာေျပာသည့္ဇယားတြင္ရွိအီးေမးလ္)"
@@ -142,12 +142,10 @@ msgstr "(လူအေယာက္ ၂၀၀ ၀၀၀ ကိုအၾကမ္
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(ပိတ္ထားသည္)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(ျပင္ျပီးျပီ)"
@@ -156,7 +154,7 @@ msgstr "(ျပင္ျပီးျပီ)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိႈ္က္စြန္႔ပစ္ျခင္း၊ လမ္းေဘးပလက္ေဖာင္းအုတ္ခဲမ်ားက်ိဳးပဲ့မႈ သို႔မဟုတ္ လမ္းမီးမလာျခင္းကဲ့သို႔)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
 
@@ -164,21 +162,21 @@ msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
 msgid "(optional)"
 msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- ပစၥည္းအမ်ိဳးအစားကိုေရြးပါ --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr "<strong>မဟုတ္ပါ</strong> ကၽြႏ္ုပ္၏အသ
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>မဟုတ္ပါ</strong> အီးေမးလ္ျဖင့္၀င္မည္"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "စာကိုယ္ထည့္မည္"
 msgid "Add new category"
 msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "အသံုးျပဳသူထည့္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "%sကိုထည့္ျပီးျပီ"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "ေျဖရွင္းထားသည့္ ျပႆနာကို 
 msgid "Anonymous"
 msgstr "အမည္မသိ"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "အမည္မသိ-"
@@ -399,7 +400,7 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္
 msgid "Assign to subdivision:"
 msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း"
@@ -446,12 +447,12 @@ msgstr "ေနာက္သို႔"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "ေျမပံုကိုမျမင္ဘူးလား။ <em>ဒီအဆင့္ကိုေက်ာ္မည္</em> "
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "ႏွစ္ခုျပဳလုပ္မည္"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "ႏွစ္ခုျပဳလုပ္မည္"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "ႏွစ္ခုျပဳလုပ္မည္"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "ျပင္ဆင္မည္"
 msgid "Edit body details"
 msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "အယ္ဒီတာ"
 msgid "Email"
 msgstr "အီးေမးလ္"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး"
 
@@ -991,11 +1009,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s
 msgid "Examples:"
 msgstr "နမူနာမ်ား -"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr "ျပင္ျပီးျပီ"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "ျပင္ျပီးျပီ-ေကာင္စီ"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ"
 
@@ -1178,7 +1198,7 @@ msgstr "ျပင္ျပီးျပီ"
 msgid "Flag as deleted"
 msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ"
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း"
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "မၾကာခဏေမးေသာေမးခြန္းမ်ား"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "သြားမည္"
@@ -1272,7 +1292,7 @@ msgstr "သြားမည္"
 msgid "Going to send questionnaire?"
 msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "မဂၤလာပါ%s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr "အတြင္းမွတ္စု"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ"
 
@@ -1515,16 +1539,16 @@ msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ"
 msgid "Invalid format %s specified."
 msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "စမည့္ရက္မမွန္ကန္ပါ"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr "ေျမပံု"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "စာ"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr ""
 msgid "Month"
 msgstr "လ"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "အမည္"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "အမည္-"
 msgid "Name: %s"
 msgstr "အမည္ - %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1847,7 @@ msgstr "ျမိဳ႕အသစ္"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1862,7 @@ msgstr "ေနာက္သို႔"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1883,7 @@ msgstr "စာကိုယ္မရွိ"
 msgid "No council"
 msgstr "ေကာင္စီမရွိ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ"
 
@@ -1911,7 +1943,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2021,15 @@ msgstr "ပို၍ေဟာင္းေသာ <br> ျပင္ျပီးျ
 msgid "Older <br>problems"
 msgstr "ပို၍ေဟာင္းေသာ<br>ျပႆနာမ်ား"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2075,13 @@ msgstr "သို႔မဟုတ္ ျပႆနာမ်ားကိုတင
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2102,7 @@ msgid "Parent"
 msgstr "ပင္မ"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "တစ္၀က္"
 
@@ -2104,7 +2136,7 @@ msgid "Phone number (optional)"
 msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2188,7 @@ msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2216,14 @@ msgid "Please check your email address is correct"
 msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "ပစၥည္းအမ်ိဳးအစားတစ္ခုကိုေရြးပါ"
 
@@ -2212,13 +2244,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "စာတစ္ခုရိုက္ထည့္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2265,13 @@ msgid "Please enter a password"
 msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2284,7 @@ msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရ
 msgid "Please enter a valid email address"
 msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
@@ -2285,8 +2317,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2355,7 @@ msgstr ""
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "စာအနည္းငယ္ႏွင့္ဓာတ္ပံုတစ္ပံုကိုလည္းေဖာ္ျပေပးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "သင္၏ေကာင္စီသို႔သင္ယခင္ကသတင္းပို႔ဖူးေၾကာင္းေျပာျပေပးပါ"
 
@@ -2378,7 +2410,7 @@ msgstr "သင္လိုခ်င္ေသာ feed ကိုေရြးပါ
 msgid "Please select the type of alert you want"
 msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္အမ်ိဳးအစားမ်ားကိုေရြးပါ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ"
 
@@ -2397,22 +2429,22 @@ msgstr "စာတစ္ေၾကာင္းေရးပါ"
 msgid "Please write your update here"
 msgstr "သင္၏အသစ္မြမ္းမံမႈကိုဒီေနရာမွာေရးပါ"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "တင္မည္"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "%s မွာ %s မွတင္ခဲ့သည္"
 
@@ -2428,7 +2460,8 @@ msgstr "ယခင္က"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "ကိုယ္ပိုင္"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "ကိုယ္ပိုင္"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "ျပႆနာ"
@@ -2483,11 +2521,11 @@ msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္
 msgid "Problems"
 msgstr "ျပႆနာမ်ား"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "အနီးနားရွိျပႆနာမ်ား"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "ေျမပံုေပၚက ျပႆနာမ်ား"
 
@@ -2499,7 +2537,7 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2561,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr ""
@@ -2540,12 +2579,16 @@ msgstr "နာမည္ႏွင့္ စကားဝွက္ကို မထ
 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 မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။"
 
+#: templates/web/base/report/new/form_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2612,7 @@ msgstr "%d, %s ျပႆနာ အတြက္ %d မွ %s ထံ ေျဖၾ
 msgid "Questionnaire %d sent for problem %d"
 msgstr "%d ျပႆနာ အတြက္ %d ေပးပို႔သည့္ စစ္တမ္းေမးခြန္းလႊာ"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက္ရမည့္ စစ္တမ္းေမးခြန္းလႊာ"
 
@@ -2577,7 +2620,7 @@ msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS feed"
 
@@ -2605,7 +2648,7 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ
 msgid "RSS feed of nearby problems"
 msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2664,12 @@ msgid "RSS feed of recent local problems"
 msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမ်ား အတြက္ RSS feed"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -2648,7 +2691,7 @@ msgstr "မၾကာေသးမီက <br> ျပင္ဆင္ၿပီး"
 msgid "Recently reported problems"
 msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2699,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2715,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2729,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2740,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2717,8 +2764,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2727,8 +2774,8 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2741,27 +2788,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2871,16 +2918,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "ဘယ္ဘက္ကို လွည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2938,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2994,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3041,27 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3133,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3181,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3228,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -3187,7 +3245,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3271,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3484,7 +3542,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3624,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္"
@@ -3593,6 +3651,10 @@ msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးပါ
 msgid "This problem has not been fixed"
 msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပါ"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3729,8 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3738,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3755,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3782,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3731,6 +3794,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3784,7 +3851,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3866,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3897,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း"
 
@@ -3843,7 +3910,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ "
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +4000,10 @@ msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္"
 msgid "When sent"
 msgstr "ေပးပို႔ခဲ့သည့္ အခ်ိန္"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3983,7 +4054,7 @@ msgstr "ခုႏွစ္"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3998,11 +4069,11 @@ msgstr "ဟုတ္သည္။"
 msgid "Yes I have a password"
 msgstr "ကၽြႏု္ပ္တြင္ စကားဝွက္တစ္ခု ရိွသည္"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။"
 
@@ -4019,7 +4090,7 @@ msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4115,9 +4186,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4137,7 +4208,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽြႏု္ပ္တို႔၏ သီးသန္႔တည္ရွိမႈ ေပၚလစီ ႏွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္။"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4216,53 +4287,53 @@ msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္
 msgid "from %s different users"
 msgstr "%s မွ မတူညီေသာ သုံးစြဲသူမ်ား"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "တစ္မိနစ္ခန္႔သာ"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "ျပဳျပင္ထားေသာ အခ်ိန္ဇယားကို အမွတ္အသားျပဳလုပ္ပါ"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "အတြင္းတြင္ လႊဲေျပာင္းထားသည္ကို အမွတ္အသားျပဳလုပ္ပါ"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "ပိတ္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "ဆက္လက္လုပ္ေဆာင္ေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "စံုစမ္းစစ္ေဆးေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "စီစဥ္ထားၿပီးျဖစ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
@@ -4308,8 +4379,8 @@ msgstr "နဂိုဝင္ေရာက္ထားမႈ: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "အျခား ဧရိယာမ်ား"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "ျပန္ဖြင့္ပါ"
 
@@ -4355,68 +4426,68 @@ msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွ
 msgid "ward"
 msgstr "အုပ္ခ်ဳပ္ေရးဌာန"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ရက္မ်ား"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d အခ်ိန္မ်ား"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d မိနစ္မ်ား"
 
-#: 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] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ"
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ရက္သတၱပတ္မ်ား"
 
+#: 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] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ"
+
 #: 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ရက္မ်ား"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား"
 
 #: 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] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေနရာႏွင့္ ပတ္သက္သည့္ အျခားေကာင္အတြက္ အေသးစိတ္မရွိေသးပါ။"
+
+#: 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] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index cf141fa83..4360c6a6a 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: pere <pere-transifex@hungry.com>, 2016\n"
 "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " og "
@@ -114,7 +114,7 @@ msgstr "%s bydel, %s"
 msgid "%s, within %s ward"
 msgstr "%s, innefor bydel %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere"
 
@@ -122,7 +122,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Feil & lokasjon for feil)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Epost i misbrukstabellen)"
@@ -146,12 +146,10 @@ msgstr "(en standardavstand som dekker en befolkning på omtrent 200 000)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(lukket)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(løst)"
@@ -160,7 +158,7 @@ msgstr "(løst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(ikke rapportert til administrasjonen)"
 
@@ -168,21 +166,21 @@ msgstr "(ikke rapportert til administrasjonen)"
 msgid "(optional)"
 msgstr "(valgfritt)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Velg en kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Velg en eiendomsstype --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Velg en mal--"
 
@@ -198,8 +196,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Vis</label> %s <label for=\"filter_categories\">om</label> %s"
@@ -222,11 +220,11 @@ msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nei</strong>, la meg logge inn med e-post:"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong>Merk:</strong> Denne rapporten er sendt videre for å få noe til å skje.  Ingen endringer sendes videre."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -237,7 +235,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jeg har et passord"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -266,26 +264,29 @@ msgstr "Legg til administrasjon"
 msgid "Add new category"
 msgstr "Legg til ny kategori"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Legg til / endre problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Legg til / endre responsprioriteter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Legg til / endre responsmaler"
 
@@ -293,7 +294,7 @@ msgstr "Legg til / endre responsmaler"
 msgid "Added %s"
 msgstr "La til %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -348,7 +349,7 @@ msgstr "En oppdatering markerte dette problemet som fikset."
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym:"
@@ -403,7 +404,7 @@ msgstr "Tildel til ekstern administrasjon:"
 msgid "Assign to subdivision:"
 msgstr "Tildelt underavdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr "Tilordne brukere til områder"
 
@@ -428,8 +429,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr "Auto-svar:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Tilgjengelige kategorier"
 
@@ -437,7 +438,7 @@ msgstr "Tilgjengelige kategorier"
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Unngå personlig informasjon og bilnummerskilt"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Avventer moderasjon"
@@ -450,12 +451,12 @@ msgstr "Tilbake"
 msgid "Back to all reports"
 msgstr "Tilbake til alle rapporter"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Bannlys epostadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -486,10 +487,6 @@ 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>."
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -502,7 +499,8 @@ msgstr "Kategorier:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -522,7 +520,7 @@ msgstr "Kategori endret fra '%s' til '%s'"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -594,6 +592,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -622,10 +624,11 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -727,8 +730,8 @@ msgstr "Kontakt prosjektgruppen"
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kunne ikke finne bruker"
 
@@ -782,7 +785,7 @@ msgstr "Opprett rapporter/oppdateringer som myndigheten"
 msgid "Create reports/updates on a user's behalf"
 msgstr "Opprett rapporter/oppdateringer på vegne av en bruker"
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Lag mal"
@@ -823,7 +826,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Behandlet av underavdeling innen 5 arbeidsdager"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Slett mal"
@@ -889,21 +892,35 @@ msgstr "Har du et %s-passord?"
 msgid "Don&rsquo;t know"
 msgstr "Vet ikke"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Liker ikke skjemaer?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Dra og slipp bilder hit eller <u>klikk for å laste opp</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplikat"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplikat"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -915,7 +932,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -934,11 +952,11 @@ msgstr "Rediger"
 msgid "Edit body details"
 msgstr "Rediger detaljer for administrasjon"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "Endre andre brukeres detaljer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "Endre andre brukeres rettigheter"
 
@@ -989,7 +1007,7 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Epost lagt til misbruksliste"
 
@@ -1007,11 +1025,11 @@ msgstr "Epostvarsel laget"
 msgid "Email alert deleted"
 msgstr "Epostvarsel slettet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Epost allerede i misbrukslisten"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1084,7 +1102,7 @@ msgid "Enter details of the problem"
 msgstr "Legg inn detaljer om problemet"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1106,8 +1124,8 @@ msgstr "Eksempel-postnummer %s"
 msgid "Examples:"
 msgstr "Eksempler:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "Eksisterende kategori"
 
@@ -1143,7 +1161,8 @@ msgstr "Eksternt lag"
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "Ekstra detaljer"
 
@@ -1165,11 +1184,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1177,12 +1197,12 @@ msgid "Fixed"
 msgstr "Løst"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Løst - Administrasjon"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Løst - Bruker"
 
@@ -1200,7 +1220,7 @@ msgstr "Løst:"
 msgid "Flag as deleted"
 msgstr "Merk som slettet"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Flag bruker"
 
@@ -1221,7 +1241,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Flagget:"
@@ -1259,7 +1279,7 @@ msgid "Frequently Asked Questions"
 msgstr "Ofte spurte spørsmål"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Få oppdateringer"
 
@@ -1285,7 +1305,7 @@ msgstr "Glad for å høre at det er i orden!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Søk"
@@ -1294,7 +1314,7 @@ msgstr "Søk"
 msgid "Going to send questionnaire?"
 msgstr "Skal det sendes spørreskjema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "Gi tilgang til administratoren"
 
@@ -1336,8 +1356,8 @@ msgstr "Hei, %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1380,7 +1400,7 @@ msgstr "Jeg rapporterte akkurat et problem på @fiksgatami"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Jeg oppdaterte akkurat et problem på @fiksgatami"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
 
@@ -1426,6 +1446,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1492,7 +1516,7 @@ msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifi
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1528,7 +1552,7 @@ msgid "Internal notes"
 msgstr "Interne notater"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Interne referanser"
 
@@ -1536,7 +1560,7 @@ msgstr "Interne referanser"
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-verdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ugyldig slutt-dato"
 
@@ -1544,16 +1568,16 @@ msgstr "Ugyldig slutt-dato"
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgitt."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1599,7 +1623,11 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1644,6 +1672,10 @@ msgstr "KART"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Kart"
@@ -1668,7 +1700,7 @@ msgstr "Merket fikset/lukket mer enn åtte uker siden"
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Melding"
 
@@ -1688,7 +1720,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr "Moderer"
 
@@ -1696,7 +1728,7 @@ msgstr "Moderer"
 msgid "Moderate report details"
 msgstr "Moderer detaljer i rapprten"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr "Moderer denne rapporten"
 
@@ -1708,7 +1740,7 @@ msgstr "Moderert av avdeling innen en arbeidsdag"
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "Mest kommentert"
 
@@ -1732,7 +1764,7 @@ msgstr "Mest kommentert"
 msgid "Name"
 msgstr "Navn"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1744,7 +1776,7 @@ msgstr "Navn:"
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr "Naviger til dette problemet"
 
@@ -1846,7 +1878,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr "Ny mal"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "Nyeste"
 
@@ -1861,7 +1893,7 @@ msgstr "Neste"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1882,7 +1914,7 @@ msgstr "Ingen administrasjon"
 msgid "No council"
 msgstr "Ingen administrasjon"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ingen administrasjon er valgt"
 
@@ -1949,7 +1981,7 @@ msgstr ""
 "aktivitet for hele instansen), mulighet å skjule meldinger eller sette status for spesialrapporter."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2027,15 +2059,15 @@ msgstr "Eldre <br>løste"
 msgid "Older <br>problems"
 msgstr "Eldre <br>problemer"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "Eldste"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2081,13 +2113,13 @@ msgstr "Eller problemer meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2108,7 +2140,7 @@ msgid "Parent"
 msgstr "Forelder"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Delvis"
 
@@ -2142,7 +2174,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonnummer (valgfritt)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2194,7 +2226,7 @@ msgstr "Plasser tegnestiften på kartet"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2222,14 +2254,14 @@ msgid "Please check your email address is correct"
 msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Velg en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Velg en type egenskap"
 
@@ -2253,13 +2285,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Vennligst legg til en melding"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Vennligst skriv et navn"
 
@@ -2274,13 +2306,13 @@ msgid "Please enter a password"
 msgstr "Skriv inn et passord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Vennligst legg inn et emne"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2293,7 +2325,7 @@ msgstr "Legg til en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Legg inn din e-post"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Legg inn opplysninger om problemet"
@@ -2326,8 +2358,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2366,7 +2398,7 @@ msgstr ""
 "Vennligst fyll inn skjemaet under med detaljene om problemet,\n"
 "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema"
 
@@ -2392,20 +2424,20 @@ 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:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2421,7 +2453,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
 
@@ -2440,22 +2472,22 @@ msgstr "Skriv inn en melding"
 msgid "Please write your update here"
 msgstr "Vennligst skriv inn din oppdatering her"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Send inn"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Lagt inn av %s (<strong>%s</strong>) %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
@@ -2471,7 +2503,8 @@ msgstr "Forrige"
 msgid "Priorities"
 msgstr "Prioriteter"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2487,10 +2520,15 @@ msgstr "Personvern og cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Ekstra detaljer"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2526,11 +2564,11 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater"
 msgid "Problems"
 msgstr "Problemer"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemer i nærheten"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemer på kartet"
 
@@ -2542,7 +2580,7 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemer innenfor %.1fkm av denne posisjonen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2566,6 +2604,7 @@ msgstr "Problemer innenfor grensene av:"
 msgid "Property address:"
 msgstr "Eiendomsadresse:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Bidra med en oppdatering"
@@ -2583,12 +2622,17 @@ msgstr "Det er valgfritt å oppgi navn og passord, men hvis du gjør det kan du
 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"
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Offentlig oppdatering:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr "Offentlig oppdatering:"
 
@@ -2612,7 +2656,7 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Spørreskjema %d sendt for problem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Spørreskjema fylt inn av feilrapportøren"
 
@@ -2620,7 +2664,7 @@ msgstr "Spørreskjema fylt inn av feilrapportøren"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
@@ -2648,7 +2692,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2664,12 +2708,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS-strøm med nylige lokale problemer"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-strøm med oppdateringer for dette problemet"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta e-post når det er oppdateringer på dette problemet"
 
@@ -2691,7 +2735,7 @@ msgstr "Nylig løste <br>problemer"
 msgid "Recently reported problems"
 msgstr "Nylig meldte problemer"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2699,13 +2743,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Fjern flagg"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2713,7 +2759,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2727,7 +2773,8 @@ msgstr "Svar til bruker:"
 msgid "Report"
 msgstr "Rapport"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
@@ -2737,6 +2784,7 @@ msgstr "Rapport-ID:"
 msgid "Report a problem"
 msgstr "Rapporter et problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Rapporter misbruk"
@@ -2760,8 +2808,8 @@ msgstr "Rapporter problemet ditt"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
 
@@ -2770,8 +2818,8 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
 
@@ -2784,27 +2832,27 @@ msgstr "Rapportert av:"
 msgid "Reported in the %s category"
 msgstr "Rapportert i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -2914,16 +2962,16 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Roter til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2934,21 +2982,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satelitt"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "markert som duplisert rapport"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2985,6 +3038,11 @@ msgstr "Søket fant ingen brukere."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#, fuzzy
+msgid "See user detail for reports created as the council"
+msgstr "Opprett rapporter/oppdateringer som myndigheten"
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3028,27 +3086,27 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Tjeneste:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Dele"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3123,7 +3181,7 @@ msgstr "Beklager, det var ikke en gyldig lenke"
 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3171,12 +3229,14 @@ msgstr "Start-dato:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3216,7 +3276,7 @@ msgstr "Underkategori: %s"
 msgid "Subdivision/Body"
 msgstr "Underavdeling/administrasjon"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Emne"
 
@@ -3233,7 +3293,7 @@ msgstr "Emne:"
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3259,7 +3319,7 @@ msgid "Submitted"
 msgstr "Sendt inn"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -3546,7 +3606,7 @@ msgstr "Det var problemer med å vise 'Alle rapporter'-siden.  Vennligst prøv i
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3637,9 +3697,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Denne informasjonen er påkrevd"
@@ -3664,6 +3724,10 @@ msgstr "Dette problemet er løst"
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikke blitt løst"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3738,7 +3802,8 @@ msgstr "For å se et kart med en mer presis plassering for dette problemet."
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3746,7 +3811,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3763,14 +3828,14 @@ msgid "Try emailing us directly:"
 msgstr "Forsøk å sende epost direkte til oss:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Kan ikke fikses"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3790,8 +3855,8 @@ msgstr "Ukjent"
 msgid "Unknown alert type"
 msgstr "Ukjent varsel-type"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -3802,6 +3867,10 @@ msgstr "Ukjent feil"
 msgid "Unknown problem ID"
 msgstr "Ukjent problem-Id"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Oppdatering"
@@ -3855,7 +3924,7 @@ msgid "Updated"
 msgstr "Oppdatert"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3870,7 +3939,7 @@ msgstr "Oppdatert!"
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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."
 
@@ -3901,11 +3970,11 @@ msgstr "Brukte kart"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Brukerflagg fjernet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Bruker flagget"
 
@@ -3914,7 +3983,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. "
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4004,6 +4073,10 @@ msgstr "Når redigert"
 msgid "When sent"
 msgstr "Når sendt"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Oj oj, brems ned! Tre bilder er nok."
@@ -4052,7 +4125,7 @@ msgstr "År"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4067,11 +4140,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr "Ja, jeg har et passord"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du klager over at denne problemrapporten ble moderert uten grunn:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:"
 
@@ -4088,7 +4161,7 @@ msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Du kan kontakte teknisk støtte via <a href='mailto:%s'>%s</a>"
 
@@ -4183,9 +4256,9 @@ msgstr "Din konto"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4205,7 +4278,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a href=\"/faq#privacy\">personvernsregler.</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4284,53 +4357,53 @@ msgstr "rediger bruker"
 msgid "from %s different users"
 msgstr "fra %s forskjellige brukere"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "sist oppdatert %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "mindre enn et minutt"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "markert som duplisert rapport"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markert som planlagt"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "markert som en intern henvisning"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "markert som lukket"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "markert som fikset"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "markert som under arbeid"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "markert som undersøkes"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markert som ikke administrasjonens ansvar"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "markert som planlagt"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "markert som uløselig"
 
@@ -4376,8 +4449,8 @@ msgstr "opprinnelig lagt inn: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andre områder:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "åpnet på nytt"
 
@@ -4423,55 +4496,48 @@ msgstr "bruker er eier av problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dager"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d støttespiller"
-msgstr[1] "%d støttespillere"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
-#: 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] "<big>%s</big> rapport-<br>oppdatering"
-msgstr[1] "<big>%s</big> rapport-<br>oppdateringer"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet."
-msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d støttespiller"
+msgstr[1] "%d støttespillere"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
+#: 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] "<big>%s</big> fikset siste måned"
+msgstr[1] "<big>%s</big> fikset siste måned"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4479,19 +4545,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dager"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> rapport-<br>oppdatering"
+msgstr[1] "<big>%s</big> rapport-<br>oppdateringer"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4499,3 +4565,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har ennå <strong>ikke</strong> detaljene for den andre administrasjonen som dekker dette stedet."
 msgstr[1] "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene som dekker dette stedet."
+
+#: 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] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet."
+msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index 800b9e58d..1e4d3746d 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jos Helmich <jos@valaquanta.fi>, 2016\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "en"
@@ -110,7 +110,7 @@ msgstr "%s district, %s"
 msgid "%s, within %s ward"
 msgstr "%s, in %s district"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 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"
 
@@ -118,7 +118,7 @@ msgstr "&Rechten; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetM
 msgid "(Defect &amp; location of defect)"
 msgstr "(Defect &amp; en locatie van het defect)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Email in misbruiktabel)"
@@ -142,12 +142,10 @@ msgstr "(een stand afstand waarbinnen ongeveer 200.000 mensen leven)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(als alternatief kan de RSS feed worden aangepast binnen %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(gesloten)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(opgelost)"
@@ -156,7 +154,7 @@ msgstr "(opgelost)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) "
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(niet verstuurd naar de gemeente)"
 
@@ -164,21 +162,21 @@ msgstr "(niet verstuurd naar de gemeente)"
 msgid "(optional)"
 msgstr "(optioneel)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(verstuurd naar beide)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Kies een categorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Kies een woning type --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Kies een website indeling--"
 
@@ -197,8 +195,8 @@ msgstr ""
 "Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).<br>\n"
 "Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nee</strong> Laat me inloggen per e-mail"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 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."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 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."
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong, ik heb een wachtwoord"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -267,26 +265,29 @@ msgstr "Voeg openbaar lichaam toe"
 msgid "Add new category"
 msgstr "Voeg een nieuwe categorie toe"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Voeg aan favorieten toe"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Voeg toe/wijzig categoriën"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Voeg toe/wijzig beantwoordingsprioriteiten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Voeg toe/wijzig antwoordstramien"
 
@@ -294,7 +295,7 @@ msgstr "Voeg toe/wijzig antwoordstramien"
 msgid "Added %s"
 msgstr "%s toegevoegd"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s zijn favorieten."
 
@@ -349,7 +350,7 @@ msgstr "Een update heeft dit probleem als opgelost gemarkeerd."
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anoniem:"
@@ -404,7 +405,7 @@ msgstr "Toegewezen aan:"
 msgid "Assign to subdivision:"
 msgstr "Toegewezen aan afdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -429,8 +430,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr "Automatisch antwoord:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Beschikbare categoriën"
 
@@ -438,7 +439,7 @@ msgstr "Beschikbare categoriën"
 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:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Wacht op controle"
@@ -451,12 +452,12 @@ msgstr "Vorige"
 msgid "Back to all reports"
 msgstr "Terug naar alle rapportages"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Verban e-mailadres"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -487,10 +488,6 @@ 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>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Annuleren"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -503,7 +500,8 @@ msgstr "Categoriën:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -523,7 +521,7 @@ msgstr "Categorie veranderd van '%s' in '%s'"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -590,6 +588,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -618,10 +620,11 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -723,8 +726,8 @@ msgstr "Neem contact op met het team"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kan de gebruiker niet vinden"
 
@@ -778,7 +781,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Maak een sjabloon"
@@ -819,7 +822,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Door een afdeling behandeld binnen 5 werkdagen"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
@@ -885,21 +888,35 @@ msgstr "Heb je een %s wachtwoord?"
 msgid "Don&rsquo;t know"
 msgstr "Geen idee"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Hou je niet van formulieren?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Plaats de fotos hier om ze te <u>verzenden</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dubbeling"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Dubbeling"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Dubbeling"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -908,7 +925,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr "Oostwaarde/Noordwaarde"
 
@@ -927,11 +945,11 @@ msgstr "Bewerk"
 msgid "Edit body details"
 msgstr "Wijzig openbaar lichaam details"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -982,7 +1000,7 @@ msgstr "Redacteur"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email toegevoegd aan zwarte lijst"
 
@@ -1000,11 +1018,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Email staat al op zwarte lijst"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1071,7 +1089,7 @@ msgid "Enter details of the problem"
 msgstr "Geef details van het probleem"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1093,8 +1111,8 @@ msgstr "Voorbeeld van postcode %s"
 msgid "Examples:"
 msgstr "Voorbeelden:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1130,7 +1148,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Extra info:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1152,11 +1171,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1164,12 +1184,12 @@ msgid "Fixed"
 msgstr "Opgelost"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Opgelost - Gemeente"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Opgelost - Gebruiker"
 
@@ -1187,7 +1207,7 @@ msgstr "Opgelost:"
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Gemarkeerde gebruikr"
 
@@ -1208,7 +1228,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Gemarkeerd:"
@@ -1246,7 +1266,7 @@ msgid "Frequently Asked Questions"
 msgstr "Veelgestelde Vragen"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Updates ontvangen"
 
@@ -1272,7 +1292,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Gaan"
@@ -1281,7 +1301,7 @@ msgstr "Gaan"
 msgid "Going to send questionnaire?"
 msgstr "Vragenlijst versturen?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1323,8 +1343,8 @@ msgstr "Hoi %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1367,7 +1387,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n"
 
@@ -1413,6 +1433,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1472,7 +1496,7 @@ msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1508,7 +1532,7 @@ msgid "Internal notes"
 msgstr "Interne notities"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1516,7 +1540,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr "Ongeldige agency_responsible waarde %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ongeldige einddatum"
 
@@ -1524,16 +1548,16 @@ msgstr "Ongeldige einddatum"
 msgid "Invalid format %s specified."
 msgstr "Ongeldig formaat %s gespecifieerd"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ongeldige startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1579,7 +1603,11 @@ msgstr "Laatste update:"
 msgid "Last&nbsp;update:"
 msgstr "Laatste update:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1624,6 +1652,10 @@ msgstr "Kaart"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Kaart"
@@ -1648,7 +1680,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Bericht"
 
@@ -1668,7 +1700,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Vermiste jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1676,7 +1708,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1688,7 +1720,7 @@ msgstr ""
 msgid "Month"
 msgstr "Maand"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1712,7 +1744,7 @@ msgstr ""
 msgid "Name"
 msgstr "Naam"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1724,7 +1756,7 @@ msgstr "Naam:"
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1826,7 +1858,7 @@ msgstr "Nieuwe status"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1841,7 +1873,7 @@ msgstr "Volgende"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1862,7 +1894,7 @@ msgstr ""
 msgid "No council"
 msgstr "Geen gemeente"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Geen gemeente geselecteerd"
 
@@ -1922,7 +1954,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2000,15 +2032,15 @@ msgstr "Ouder<br>opgelost"
 msgid "Older <br>problems"
 msgstr "Oudere<br>problemen"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2054,13 +2086,13 @@ msgstr "Of problemen gemeld aan:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2081,7 +2113,7 @@ msgid "Parent"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Gedeeltelijk"
 
@@ -2115,7 +2147,7 @@ msgid "Phone number (optional)"
 msgstr "Telefoonnummer (optioneel)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2167,7 +2199,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2195,14 +2227,14 @@ msgid "Please check your email address is correct"
 msgstr "Controleer of je e-mailadres klopt"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Kies een categorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Kies een pand type"
 
@@ -2223,13 +2255,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Geef bericht in"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2244,13 +2276,13 @@ msgid "Please enter a password"
 msgstr "Geef wachtwoord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Geef onderwerp"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2263,7 +2295,7 @@ msgstr "Geef een geldig e-mailadres"
 msgid "Please enter a valid email address"
 msgstr "Geef een geldig e-mailadres"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Geef details"
@@ -2296,8 +2328,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2334,7 +2366,7 @@ msgstr "Vul de details van het probleem in."
 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 "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locatie zo precies mogelijk."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Geef aan of je een vragenlijst wilt ontvangen"
 
@@ -2360,20 +2392,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Let op:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Vermeld wat tekst en een foto"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2389,7 +2421,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Geef aan of het probleem is verholpen"
 
@@ -2408,22 +2440,22 @@ msgstr "Schrijf een bericht"
 msgid "Please write your update here"
 msgstr "Schrijf je update hier"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Bericht"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Anoniem geplaatst bij %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Geplaatst door %s (<strong>%s</strong>) bij %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Geplaatst door %s bij %s"
 
@@ -2439,7 +2471,8 @@ msgstr "Vorige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2455,10 +2488,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privé"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privé"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Probleem"
@@ -2494,11 +2532,11 @@ msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten"
 msgid "Problems"
 msgstr "Problemen"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemen dichtbij"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemen op de kaart"
 
@@ -2510,7 +2548,7 @@ msgstr "Recent gemelde problemen op FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemen binnen een straal van %.1fkm van deze lokatie"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2534,6 +2572,7 @@ msgstr "Problemen binnen de grenzen van:"
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Geef een update"
@@ -2551,12 +2590,16 @@ msgstr ""
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2580,7 +2623,7 @@ msgstr "Vragenlijst %d beantwoord voor probleem %d, %s tot %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Vragenlijst %d verzonden voor probleem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Vragenlijst ingevuld door melder"
 
@@ -2588,7 +2631,7 @@ msgstr "Vragenlijst ingevuld door melder"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS feed"
 
@@ -2616,7 +2659,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2632,12 +2675,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS feed van recente lokale problemen"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed van updates voor dit probleem"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem."
 
@@ -2659,7 +2702,7 @@ msgstr "Recent <br>opgelost"
 msgid "Recently reported problems"
 msgstr "Recent gemelde problemen"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2667,13 +2710,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Verwijder markering"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2681,7 +2726,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2695,7 +2740,8 @@ msgstr "Beantwoord"
 msgid "Report"
 msgstr "Melding"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2705,6 +2751,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Meld een probleem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Meld misbruik"
@@ -2728,8 +2775,8 @@ msgstr "Probleem melden"
 msgid "Report, view, or discuss local problems"
 msgstr "Meld, bekijk of discussier over lokale problemen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anoniem gemeld bij %s"
 
@@ -2738,8 +2785,8 @@ msgstr "Anoniem gemeld bij %s"
 msgid "Reported before"
 msgstr "Eerder gemeld"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeld door %s bij %s"
 
@@ -2752,27 +2799,27 @@ msgstr "Gemeld door:"
 msgid "Reported in the %s category"
 msgstr "Toegewezen aan categorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anoniem gemeld in de categorie %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Anoniem door %s gemeld bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeld door %s door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeld door %s in de  categorie %s door %s bij %s"
 
@@ -2882,16 +2929,16 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Linksom roteren"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2902,21 +2949,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Wijzigingen opslaan"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2953,6 +3004,10 @@ msgstr "Geen gebruikers gevonden."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2996,27 +3051,27 @@ msgstr "Verzonden:"
 msgid "Service:"
 msgstr "Service:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Deel"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3088,7 +3143,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3136,12 +3191,14 @@ msgstr "Startdatum:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Staat"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3181,7 +3238,7 @@ msgstr "Subcategorie: %s"
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -3198,7 +3255,7 @@ msgstr "Onderwerp:"
 msgid "Submit"
 msgstr "Opslaan"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3224,7 +3281,7 @@ msgid "Submitted"
 msgstr "Opgeslagen"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3495,7 +3552,7 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3577,9 +3634,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Deze informatie is verplicht"
@@ -3604,6 +3661,10 @@ msgstr "Dit probleem is opgelost"
 msgid "This problem has not been fixed"
 msgstr "Dit probleem is niet opgelost"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3678,7 +3739,8 @@ msgstr ""
 msgid "Total"
 msgstr "Totaal"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3686,7 +3748,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3703,14 +3765,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3730,8 +3792,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3742,6 +3804,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3795,7 +3861,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3810,7 +3876,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3841,11 +3907,11 @@ msgstr "Gebruikte kaart"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3854,7 +3920,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3944,6 +4010,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3992,7 +4062,7 @@ msgstr "Jaar"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4007,11 +4077,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr "Ja, ik heb een wachtwoord"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:"
 
@@ -4028,7 +4098,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4119,9 +4189,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4141,7 +4211,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4220,53 +4290,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr "door %s verschillende gebruikers"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "minder dan een minuut"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "gemarkeerd als gesloten"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "gemarkeerd als opgelost"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "gemarkeerd als in behandeling"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "gemarkeerd als in onderzoek"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "gemarkeerd als gepland"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4312,8 +4382,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -4359,55 +4429,48 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dagen"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d voorstander"
-msgstr[1] "%d voorstanders"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: 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/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] ""
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d voorstander"
+msgstr[1] "%d voorstanders"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
+#: 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"
@@ -4415,19 +4478,19 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dagen"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] ""
+msgstr[1] ""
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4435,3 +4498,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index e83fdd3fa..77f0cec84 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " og "
@@ -110,7 +110,7 @@ msgstr "%s bydel, %s"
 msgid "%s, within %s ward"
 msgstr "%s, innanfor bydelen %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Epost i misbruktabellen)"
@@ -142,12 +142,10 @@ msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(lukka)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(løyst)"
@@ -156,7 +154,7 @@ msgstr "(løyst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(ikkje rapportert til administrasjonen)"
 
@@ -164,21 +162,21 @@ msgstr "(ikkje rapportert til administrasjonen)"
 msgid "(optional)"
 msgstr "(valfritt)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Vel ein kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Vel ein eigedomstype --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, eg har eit passord"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr ""
 msgid "Add new category"
 msgstr "Legg til ny kategori"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "La til %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "Ei oppdatering markerte dette problemet som løyst."
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym:"
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr ""
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Bannlys e-postadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Kontakt prosjektgruppa"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kunne ikkje finna brukaren"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,33 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Veit ikkje"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:71
+msgid "Duplicate of"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:81
+msgid "Duplicates"
+msgstr ""
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +914,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +934,11 @@ msgstr "Rediger"
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +989,7 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "E-post lagd til misbrukliste"
 
@@ -991,11 +1007,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-post allereie i misbruklista"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1078,7 @@ msgid "Enter details of the problem"
 msgstr "Legg inn detaljar om problemet"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1100,8 @@ msgstr "Postnummerdøme %s"
 msgid "Examples:"
 msgstr "Døme:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1137,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1160,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1173,12 @@ msgid "Fixed"
 msgstr "Løyst"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Løyst – Administrasjon"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Løyst – Brukar"
 
@@ -1178,7 +1196,7 @@ msgstr "Løyst:"
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Flagg brukar"
 
@@ -1199,7 +1217,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Flagga:"
@@ -1237,7 +1255,7 @@ msgid "Frequently Asked Questions"
 msgstr "Ofte spurde spurnader"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr ""
 
@@ -1263,7 +1281,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Hald fram"
@@ -1272,7 +1290,7 @@ msgstr "Hald fram"
 msgid "Going to send questionnaire?"
 msgstr "Skal spørjeskjemaet sendast?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1332,8 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1376,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n"
 
@@ -1404,6 +1422,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1485,7 @@ msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifi
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1521,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1529,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-verdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Ugyldig slutt-dato"
 
@@ -1515,16 +1537,16 @@ msgstr "Ugyldig slutt-dato"
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgjeve."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1592,11 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1641,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1669,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr ""
 
@@ -1659,7 +1689,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Manglar jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1697,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1709,7 @@ msgstr ""
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1733,7 @@ msgstr ""
 msgid "Name"
 msgstr "Namn"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1745,7 @@ msgstr "Namn:"
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1845,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1860,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1881,7 @@ msgstr ""
 msgid "No council"
 msgstr "Ingen administrasjon"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ingen administrasjon er vald"
 
@@ -1911,7 +1941,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2019,15 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2073,13 @@ msgstr "Eller problem meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2100,7 @@ msgid "Parent"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Delvis"
 
@@ -2104,7 +2134,7 @@ msgid "Phone number (optional)"
 msgstr ""
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2186,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2214,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vel ein kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Vel ein type eigenskap"
 
@@ -2212,13 +2242,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Ver venleg og skriv ei melding"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2263,13 @@ msgid "Please enter a password"
 msgstr "Skriv inn eit passord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Ver venleg og legg inn eit emne"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2282,7 @@ 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/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Ver venleg og legg inn opplysningar om problemet"
@@ -2285,8 +2315,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2325,7 +2355,7 @@ msgstr ""
 "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n"
 "og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema"
 
@@ -2351,20 +2381,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Merk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2380,7 +2410,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje"
 
@@ -2399,22 +2429,22 @@ msgstr "Skriv inn ei melding"
 msgid "Please write your update here"
 msgstr ""
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Send inn"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Lagt inn av %s (<strong>%s</strong>) %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
@@ -2430,7 +2460,8 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2446,10 +2477,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr ""
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Ver venleg og legg inn opplysningar om problemet"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2485,11 +2521,11 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat"
 msgid "Problems"
 msgstr "Problem"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr ""
 
@@ -2501,7 +2537,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problem innanfor %.1fkm av denne posisjonen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2525,6 +2561,7 @@ msgstr "Problem innanfor grensene av:"
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Bidra med ei oppdatering"
@@ -2542,12 +2579,16 @@ msgstr ""
 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"
 
+#: templates/web/base/report/new/form_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2571,7 +2612,7 @@ msgstr "Spørjeskjema %d fylt inn for problem %d, %s til %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Spørjeskjema %d sendt for problem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Spørjeskjema fylt inn av feilrapportøren"
 
@@ -2579,7 +2620,7 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-straum"
 
@@ -2607,7 +2648,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2623,12 +2664,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS-straum med nye lokale problem"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-straum med oppdateringar for dette problemet"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta e-post når det er oppdateringar på dette problemet"
 
@@ -2650,7 +2691,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nyleg melde problem"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2658,13 +2699,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Fjern flagg"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2672,7 +2715,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2686,7 +2729,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2696,6 +2740,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Rapporter eit problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2719,8 +2764,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
 
@@ -2729,8 +2774,8 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidlegare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
 
@@ -2743,27 +2788,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -2873,16 +2918,16 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2893,21 +2938,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Lagra endringar"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2944,6 +2993,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2987,27 +3040,27 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Teneste:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3079,7 +3132,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3127,12 +3180,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3172,7 +3227,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -3189,7 +3244,7 @@ msgstr "Emne:"
 msgid "Submit"
 msgstr "Send inn"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3215,7 +3270,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -3489,7 +3544,7 @@ msgstr "Det oppstod problem med å visa «Alle rapportar»-sida.  Ver venleg og
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3571,9 +3626,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Denne informasjonen er påkravd"
@@ -3598,6 +3653,10 @@ msgstr "Dette problemet er løyst"
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikkje vorte løyst"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3672,7 +3731,8 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3680,7 +3740,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3697,14 +3757,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3724,8 +3784,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr "Ukjend varsel-type"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3736,6 +3796,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr "Ukjend problem-ID"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3789,7 +3853,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3804,7 +3868,7 @@ msgstr "Oppdatert!"
 msgid "Updates"
 msgstr "Oppdateringar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3835,11 +3899,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Brukarflagg fjerna"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Brukar flagga"
 
@@ -3848,7 +3912,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3938,6 +4002,10 @@ msgstr "Når redigert"
 msgid "When sent"
 msgstr "Når sendt"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3986,7 +4054,7 @@ msgstr "År"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4001,11 +4069,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:"
 
@@ -4022,7 +4090,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4113,9 +4181,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4135,7 +4203,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4214,53 +4282,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr "frå %s ulike brukarar"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "mindre enn eitt minutt"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr ""
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "markert som løyst"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4306,8 +4374,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "andre område:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "opna på nytt"
 
@@ -4353,55 +4421,48 @@ msgstr "brukaren er eigaren av problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: 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"
-
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "%d hour"
-msgid_plural "%d hours"
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/web/base/report/_support.html:6
+#: perllib/Utils.pm:225
 #, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
+msgid "%d hour"
+msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 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] "<big>%s</big> rapportoppdatering"
-msgstr[1] "<big>%s</big> rapportoppdateringar"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden."
-msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 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] "<big>%s</big> løyst siste månad"
+msgstr[1] "<big>%s</big> løyst siste månad"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4409,19 +4470,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> rapportoppdatering"
+msgstr[1] "<big>%s</big> rapportoppdateringar"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4429,3 +4490,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden."
 msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden."
+
+#: 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] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden."
+msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden."
diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0ed42fa6c..da6c17968 100644
--- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "e"
@@ -110,7 +110,7 @@ msgstr "%s ala, %s"
 msgid "%s, within %s ward"
 msgstr "%s, %s dentro da ala"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(E-mail na tabela de abuso)"
@@ -142,12 +142,10 @@ msgstr "(A distância padrão, que abrange cerca de 50 mil pessoas)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(alternativamente, o feed RSS pode ser personalizado, dentro de %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(fechado)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(Corrigido)"
@@ -156,7 +154,7 @@ msgstr "(Corrigido)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(Como ruas e pavimentos esburacados, grafitis, árvores caídas, lajes partidas, entulhos, lixo, sinais transito, vandalismo, postes caídos, vazamentos de agua e esgotos, iluminação pública ou qualquer outro problema)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(Não reportar ao município)"
 
@@ -164,21 +162,21 @@ msgstr "(Não reportar ao município)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(remeter para ambos)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Escolha uma categoria --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Escolha um tipo de categoria --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
@@ -218,11 +216,11 @@ msgstr "<strong> Não </strong> Deixe-me confirmar a minha atualização por e-m
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong> Não </strong>, deixe-me entrar por e-mail"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong> Sim </strong> Eu tenho uma password"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr "Adicionar"
 msgid "Add new category"
 msgstr "Adicionar nova categoria"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Adicionar user"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Adicionado %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr "Uma atualização marcada, problema esta resolvido"
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonimo:"
@@ -399,7 +400,7 @@ msgstr "Atribuir ao órgão externo:"
 msgid "Assign to subdivision:"
 msgstr "Atribuir a subdivisão:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Aguardando moderação"
@@ -446,12 +447,12 @@ msgstr "Voltar"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Ban endereço de e-mail"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ 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>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr "Clique no link do email de confirmação para entrar"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr "Fale com a equipe"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Não foi possível encontrar usuário"
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratadas pelas  subdivisões dentro de 5 dias úteis"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,35 @@ msgstr "Já tem uma password?"
 msgid "Don&rsquo;t know"
 msgstr "Não sei"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicar"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Duplicar"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Duplicar"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +916,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +936,11 @@ msgstr "Editar"
 msgid "Edit body details"
 msgstr "Editar os detalhes do corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +991,7 @@ msgstr "Editar"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Email adicionado a lista de abusos"
 
@@ -991,11 +1009,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-mail já está na lista abusos"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1080,7 @@ msgid "Enter details of the problem"
 msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1102,8 @@ msgstr "Exemplo PostCode %s"
 msgid "Examples:"
 msgstr "Exemplos:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1139,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dados adicionais:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1162,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1175,12 @@ msgid "Fixed"
 msgstr "FIX"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Corrigido - Concelho"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Corrigido - Usuario"
 
@@ -1178,7 +1198,7 @@ msgstr "Corrigido:"
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Bandeira - Usuario"
 
@@ -1199,7 +1219,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Marcado:"
@@ -1237,7 +1257,7 @@ msgid "Frequently Asked Questions"
 msgstr "Perguntas mais frequentes"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Atualizações"
 
@@ -1263,7 +1283,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr " Ir"
@@ -1272,7 +1292,7 @@ msgstr " Ir"
 msgid "Going to send questionnaire?"
 msgstr "Vai enviar questionário?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1334,8 @@ msgstr "Oi %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1378,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Receio que não foi possível localizar o seu problema no banco de dados.\n"
 
@@ -1404,6 +1424,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1487,7 @@ msgstr "Além disso, os seguintes atributos que não fazem parte da especificaç
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1523,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1531,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr "Agencia_responsavel valor %s inválido"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Invalido data final"
 
@@ -1515,16 +1539,16 @@ msgstr "Invalido data final"
 msgid "Invalid format %s specified."
 msgstr "Formato inválido%s especificado."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Data de inicio invalida"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1594,11 @@ msgstr "Última atualização:"
 msgid "Last&nbsp;update:"
 msgstr "Última atualização:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1643,10 @@ msgstr "Mapa"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1671,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Menssagem"
 
@@ -1659,7 +1691,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Falta informaçao jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1699,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1711,7 @@ msgstr "Moderado por divisão dentro de um dia de trabalho"
 msgid "Month"
 msgstr "Mês"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1735,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nome"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1747,7 @@ msgstr "Nome:"
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1818,7 +1850,7 @@ msgstr "Novo estado"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1833,7 +1865,7 @@ msgstr "Proximo"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1854,7 +1886,7 @@ msgstr "Nenhum corpo"
 msgid "No council"
 msgstr "Sem concelho"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Nenhum Concelho selecionado"
 
@@ -1914,7 +1946,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1992,15 +2024,15 @@ msgstr "Mais antigo <br>fixado"
 msgid "Older <br>problems"
 msgstr "Mais antigo <br>problemas"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2046,13 +2078,13 @@ msgstr "Ou os problemas relatados para:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou concelho você está inserido"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2073,7 +2105,7 @@ msgid "Parent"
 msgstr "Parente"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Parcial"
 
@@ -2107,7 +2139,7 @@ msgid "Phone number (optional)"
 msgstr "Telefone (opcional)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2159,7 +2191,7 @@ msgstr "Coloque a fix pin no mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2187,14 +2219,14 @@ msgid "Please check your email address is correct"
 msgstr "Favor verificar se seu email esta correcto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Escolher uma categoria"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Por favor, escolha um tipo de imóvel"
 
@@ -2218,13 +2250,13 @@ msgstr ""
 "<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Por favor insira uma mensagem"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2239,13 +2271,13 @@ msgid "Please enter a password"
 msgstr "Por favor insira uma password"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor insira um assunto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2258,7 +2290,7 @@ 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/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, insira alguns detalhes"
@@ -2291,8 +2323,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2329,7 +2361,7 @@ msgstr "Por favor, preencha os detalhes do problema."
 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 descrever a localização mais precisa possível na caixa de detalhes."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Por favor, indique se você gostaria de receber um outro questionário"
 
@@ -2355,20 +2387,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Favor notar:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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 conselho antes"
 
@@ -2384,7 +2416,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique se o problema foi corrigido"
 
@@ -2403,22 +2435,22 @@ msgstr "Por favor, escreva uma mensagem"
 msgid "Please write your update here"
 msgstr "Por favor, escreva a sua atualização aqui"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Postar"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Postado anonimamente em %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Postado por %s (<strong>%s</strong>) em %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postado por %s aem %s"
 
@@ -2434,7 +2466,8 @@ msgstr "Anterior"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2450,10 +2483,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privado"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Privado"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problema"
@@ -2489,11 +2527,11 @@ msgstr "Mudança de estado do problema com base nos resultados da pesquisa"
 msgid "Problems"
 msgstr "Problemas"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Nas proximidades"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemas no mapa"
 
@@ -2505,7 +2543,7 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas dentro de %.1fkm deste local"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2529,6 +2567,7 @@ msgstr "Problemas dentro do limite de:"
 msgid "Property address:"
 msgstr "Endereço do imóvel:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Fornecer uma atualização"
@@ -2546,12 +2585,17 @@ msgstr ""
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Resposta do público:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Resposta do público:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2575,7 +2619,7 @@ msgstr "Questionário %d respondeu para o problema de %d, %s para %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Questionário %d enviou para o problema de %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Questionário preenchido por problema repórter"
 
@@ -2583,7 +2627,7 @@ msgstr "Questionário preenchido por problema repórter"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS feed"
 
@@ -2611,7 +2655,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2627,12 +2671,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS feed dos problemas locais recentes"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed de atualizações para este problema"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "RSS feed dos problemas locais recentes"
 
@@ -2654,7 +2698,7 @@ msgstr "Recentement <br>fixed"
 msgid "Recently reported problems"
 msgstr "Problemas recentemente reportados"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2662,13 +2706,15 @@ 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 "Lembre-se que FixMyStreetMIndelo é 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Remover bandeira"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2676,7 +2722,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2690,7 +2736,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2700,6 +2747,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Reportar um problema"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Abusivo"
@@ -2723,8 +2771,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Reportar, ver ou discutir problemas locais"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Relatado anonimamente em %s"
 
@@ -2733,8 +2781,8 @@ msgstr "Relatado anonimamente em %s"
 msgid "Reported before"
 msgstr "Relatado antes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Relatado por %s em %s"
 
@@ -2747,27 +2795,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Relatado na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Relatado na categoria %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Relatado por %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Relatado por %s por%s em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Relatado por %s na categoria %s por %s em %s"
 
@@ -2877,16 +2925,16 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2897,21 +2945,25 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+msgid "Save + close as duplicate"
+msgstr ""
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2948,6 +3000,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2991,27 +3047,27 @@ msgstr "Enviar:"
 msgid "Service:"
 msgstr "Srerviço:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Acçao"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3083,7 +3139,7 @@ msgstr ""
 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3131,12 +3187,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3176,7 +3234,7 @@ msgstr "Subcategoria: %s"
 msgid "Subdivision/Body"
 msgstr "Zona / Bairro"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Assunto:"
 
@@ -3193,7 +3251,7 @@ msgstr "Assunto:"
 msgid "Submit"
 msgstr "Submeter"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3219,7 +3277,7 @@ msgid "Submitted"
 msgstr "Submitido"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Subscrever"
 
@@ -3490,7 +3548,7 @@ msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favo
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3572,9 +3630,9 @@ msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do pr
 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 conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Esta informação é necessária"
@@ -3599,6 +3657,10 @@ msgstr "Este problema foi resolvido"
 msgid "This problem has not been fixed"
 msgstr "Este problema não foi corrigido"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3673,7 +3735,8 @@ msgstr "Para ver no mapa a localização exata desse problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3698,14 +3761,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Incapaz de ser resolvido"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3725,8 +3788,8 @@ msgstr "Desconhecido"
 msgid "Unknown alert type"
 msgstr "Tipo de alerta desconhecido"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Erro desconhecido"
@@ -3737,6 +3800,10 @@ msgstr "Erro desconhecido"
 msgid "Unknown problem ID"
 msgstr "Desconhecido problema com ID"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Actualizar"
@@ -3790,7 +3857,7 @@ msgid "Updated"
 msgstr "Atualizado"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3805,7 +3872,7 @@ msgstr "Actualizado!"
 msgid "Updates"
 msgstr "Actualizaçoes"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3836,11 +3903,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Bandeira usuário removida"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Usuário sinalizado"
 
@@ -3849,7 +3916,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3939,6 +4006,10 @@ msgstr "Quando editar"
 msgid "When sent"
 msgstr "Quando enviar"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3987,7 +4058,7 @@ msgstr "Ano"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4002,11 +4073,11 @@ msgstr "Sim"
 msgid "Yes I have a password"
 msgstr "Sim, tenho uma password"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:"
 
@@ -4023,7 +4094,7 @@ msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>."
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4114,9 +4185,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4136,7 +4207,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> política de privacidade </a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4215,53 +4286,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr "e %s usuários diferentes"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Última atualizada %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "menos de um minuto"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr ""
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr ""
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "marcados como fechados"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "marcado como fixo"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr ""
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr ""
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr ""
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr ""
 
@@ -4307,8 +4378,8 @@ msgstr "originalmente introduzido: \"%s\""
 msgid "other areas:"
 msgstr "outras áreas:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "reaberto"
 
@@ -4354,55 +4425,48 @@ msgstr "usuário é proprietário problema"
 msgid "ward"
 msgstr "pendente"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d suppoter"
-msgstr[1] "%d supporters"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: 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] "<big>%s</big> atualização em relatório"
-msgstr[1] "<big>%s</big>Atualização dos relatórios"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Nós ainda não temos detalhes para o conselho, que abrange este local."
-msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d suppoter"
+msgstr[1] "%d supporters"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: 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] "<big>%s</big> fixado no mês passado"
+msgstr[1] "<big>%s</big>Arranjado no mês passado"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4410,19 +4474,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dia"
-msgstr[1] "%d dias"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> atualização em relatório"
+msgstr[1] "<big>%s</big>Atualização dos relatórios"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4430,3 +4494,10 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local."
 msgstr[1] "Fazemos <strong> não </strong> ainda tem 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] "Nós ainda não temos detalhes para o conselho, que abrange este local."
+msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local."
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 81ce09a26..28e1433b4 100644
--- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "şi"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "%s, within %s ward"
 msgstr ""
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr ""
@@ -142,12 +142,10 @@ msgstr "(o distanță implicită ce acoperă în jur de 200 000 de locuitori)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(închis)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(rezolvat)"
@@ -156,7 +154,7 @@ msgstr "(rezolvat)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(netrimis)"
 
@@ -164,21 +162,21 @@ msgstr "(netrimis)"
 msgid "(optional)"
 msgstr "(opțional)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Alege o categorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Alege un tip de proprietate --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -194,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -218,11 +216,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -233,7 +231,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -262,26 +260,29 @@ msgstr ""
 msgid "Add new category"
 msgstr "Adaugă o categorie nouă"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Adaugă utilizator"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -289,7 +290,7 @@ msgstr ""
 msgid "Added %s"
 msgstr ""
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -344,7 +345,7 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr ""
@@ -399,7 +400,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -424,8 +425,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -433,7 +434,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -446,12 +447,12 @@ msgstr ""
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -482,10 +483,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -498,7 +495,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -518,7 +516,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -581,6 +579,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -609,10 +611,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -714,8 +717,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr ""
 
@@ -769,7 +772,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -810,7 +813,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -876,21 +879,33 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr ""
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:71
+msgid "Duplicate of"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:81
+msgid "Duplicates"
+msgstr ""
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -899,7 +914,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -918,11 +934,11 @@ msgstr ""
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -973,7 +989,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -991,11 +1007,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1062,7 +1078,7 @@ msgid "Enter details of the problem"
 msgstr ""
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1084,8 +1100,8 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1121,7 +1137,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1143,11 +1160,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1155,12 +1173,12 @@ msgid "Fixed"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr ""
 
@@ -1178,7 +1196,7 @@ msgstr ""
 msgid "Flag as deleted"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr ""
 
@@ -1199,7 +1217,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr ""
@@ -1237,7 +1255,7 @@ msgid "Frequently Asked Questions"
 msgstr ""
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr ""
 
@@ -1263,7 +1281,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1272,7 +1290,7 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1314,8 +1332,8 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1358,7 +1376,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
@@ -1404,6 +1422,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1463,7 +1485,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1499,7 +1521,7 @@ msgid "Internal notes"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr ""
 
@@ -1507,7 +1529,7 @@ msgstr ""
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr ""
 
@@ -1515,16 +1537,16 @@ msgstr ""
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1570,7 +1592,11 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1641,10 @@ msgstr ""
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1639,7 +1669,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr ""
 
@@ -1659,7 +1689,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1667,7 +1697,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1679,7 +1709,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1703,7 +1733,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1715,7 +1745,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1815,7 +1845,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1830,7 +1860,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1851,7 +1881,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr ""
 
@@ -1911,7 +1941,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -1989,15 +2019,15 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2043,13 +2073,13 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2070,7 +2100,7 @@ msgid "Parent"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr ""
 
@@ -2104,7 +2134,7 @@ msgid "Phone number (optional)"
 msgstr ""
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2156,7 +2186,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2184,14 +2214,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2212,13 +2242,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2233,13 +2263,13 @@ msgid "Please enter a password"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2252,7 +2282,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
@@ -2285,8 +2315,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2323,7 +2353,7 @@ msgstr ""
 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 ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
@@ -2349,20 +2379,20 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
@@ -2378,7 +2408,7 @@ msgstr ""
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
@@ -2397,22 +2427,22 @@ msgstr ""
 msgid "Please write your update here"
 msgstr ""
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr ""
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr ""
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr ""
 
@@ -2428,7 +2458,8 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2444,10 +2475,14 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr ""
 
+#: templates/web/base/report/new/form_user.html:1
+msgid "Private details"
+msgstr ""
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr ""
@@ -2483,11 +2518,11 @@ msgstr ""
 msgid "Problems"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr ""
 
@@ -2499,7 +2534,7 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2523,6 +2558,7 @@ msgstr ""
 msgid "Property address:"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr ""
@@ -2540,12 +2576,16 @@ msgstr ""
 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_report.html:10
+msgid "Public details"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2569,7 +2609,7 @@ msgstr ""
 msgid "Questionnaire %d sent for problem %d"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
@@ -2577,7 +2617,7 @@ msgstr ""
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr ""
 
@@ -2605,7 +2645,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2621,12 +2661,12 @@ msgid "RSS feed of recent local problems"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
@@ -2648,7 +2688,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2656,13 +2696,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2670,7 +2712,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2684,7 +2726,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2694,6 +2737,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr ""
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr ""
@@ -2717,8 +2761,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2727,8 +2771,8 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2741,27 +2785,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2871,16 +2915,16 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2891,21 +2935,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "marcat ca raport duplicat"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2942,6 +2991,10 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2985,27 +3038,27 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3077,7 +3130,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3125,12 +3178,14 @@ msgstr ""
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3170,7 +3225,7 @@ msgstr ""
 msgid "Subdivision/Body"
 msgstr ""
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr ""
 
@@ -3187,7 +3242,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3213,7 +3268,7 @@ msgid "Submitted"
 msgstr ""
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr ""
 
@@ -3484,7 +3539,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3566,9 +3621,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr ""
@@ -3593,6 +3648,10 @@ msgstr ""
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3667,7 +3726,8 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3675,7 +3735,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3692,14 +3752,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3719,8 +3779,8 @@ msgstr ""
 msgid "Unknown alert type"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr ""
@@ -3731,6 +3791,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr ""
@@ -3784,7 +3848,7 @@ msgid "Updated"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3799,7 +3863,7 @@ msgstr ""
 msgid "Updates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3830,11 +3894,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3843,7 +3907,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3933,6 +3997,10 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3981,7 +4049,7 @@ msgstr ""
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -3996,11 +4064,11 @@ msgstr ""
 msgid "Yes I have a password"
 msgstr ""
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4017,7 +4085,7 @@ msgstr ""
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr ""
 
@@ -4108,9 +4176,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4130,7 +4198,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr ""
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4209,53 +4277,53 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "mai puţin de un minut"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "marcat ca raport duplicat"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcat ca acţiune planificată"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "marcat ca trimitere internă"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "marcat ca închis"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "marcat ca rezolvat"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "marcat ca fiind în curs de desfăşurare"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "marcat ca fiind în curs de cercetare"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcat ca nefiind responsabilitatea consiliului"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "marcat ca planificat"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "marcat ca imposibil de rezolvat"
 
@@ -4301,8 +4369,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr ""
 
@@ -4348,15 +4416,15 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
+msgid "%d day"
+msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4364,15 +4432,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4380,26 +4440,26 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/front/stats.html:25
+#: templates/web/base/report/_support.html:6
 #, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
+msgid "%d supporter"
+msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/report/new/top_message_none.html:3
+#: perllib/Utils.pm:221
 #, 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."
+msgid "%d week"
+msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:220
+#: templates/web/base/front/stats.html:19
 #, perl-format
-msgid "%d week"
-msgid_plural "%d weeks"
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -4412,18 +4472,18 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -4435,3 +4495,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: 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[2] ""
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
index beca79978..41174b382 100644
--- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ru.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "и"
@@ -122,7 +122,7 @@ msgstr "%s район, %s"
 msgid "%s, within %s ward"
 msgstr "%s, в пределах района: %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; участники проекта <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
 
@@ -130,7 +130,7 @@ msgstr "&copy; участники проекта <a href=\"http://www.openstreet
 msgid "(Defect &amp; location of defect)"
 msgstr "(Повреждение и местоположение повреждения)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(адрес эл. почты в таблице пользователей, которые писали оскорбительные комментарии)"
@@ -154,12 +154,10 @@ msgstr "(Территория, заданная по умолчанию, на к
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(RSS-фид можно настроить по параметру удаленности: %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(закрыто)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(исправлено)"
@@ -168,7 +166,7 @@ msgstr "(исправлено)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(например: граффити, мусор в неположенных местах, поврежденная тротуарная плитка, разбитые уличные фонари)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(не отправлено в органы самоуправления)"
 
@@ -176,21 +174,21 @@ msgstr "(не отправлено в органы самоуправления)
 msgid "(optional)"
 msgstr "(необязательно)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(отправлено в обе инстанции)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Выберите категорию --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Выберите тип имущества --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -209,8 +207,8 @@ msgstr ""
 "Возможно, поэтому поле «зона покрытия» не заполнено (см. ниже).<br>\n"
 "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Показать отчеты:</label> %s <label for=\"filter_categories\">в категории:</label> %s"
@@ -233,11 +231,11 @@ msgstr "<strong>Нет</strong> Я хочу подтвердить обновл
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Нет</strong>, я хочу войти на сайт с помощью адреса эл. почты"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -248,7 +246,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Да</strong> У меня есть пароль"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -280,26 +278,29 @@ msgstr "Добавить учреждение"
 msgid "Add new category"
 msgstr "Добавить категорию"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -307,7 +308,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Добавлено: %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -362,7 +363,7 @@ msgstr "В обновлении эта неполадка помечена ка
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Анонимно:"
@@ -417,7 +418,7 @@ msgstr "Направить во внешнее учреждение:"
 msgid "Assign to subdivision:"
 msgstr "Направить в подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -442,8 +443,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -451,7 +452,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Ожидает модерации"
@@ -464,12 +465,12 @@ msgstr "Назад"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Добавить адрес эл. почты в черный список"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -500,10 +501,6 @@ msgstr "Письмо не пришло? Оно могло попасть в па
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Карта не отображается? <em>Пропустите этот шаг</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -516,7 +513,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -536,7 +534,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Процент устранения неполадок в этой категории,  которым больше 4 недель"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -612,6 +610,10 @@ msgstr ""
 "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и  \n"
 "                  сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений."
 
+#: templates/web/base/report/_inspect.html:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -640,10 +642,11 @@ msgstr "Чтобы войти, пройдите по ссылке, указан
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -745,8 +748,8 @@ msgstr "Свяжитесь с командой"
 msgid "Coordinates:"
 msgstr "Координаты:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Не удалось найти пользователя"
 
@@ -800,7 +803,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Создать шаблон"
@@ -841,7 +844,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Вопрос решен подразделением в течение 5 рабочих дней"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Удалить шаблон"
@@ -907,21 +910,35 @@ msgstr "У вас есть пароль на сайте %s?"
 msgid "Don&rsquo;t know"
 msgstr "Не знаю"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Не любите заполнять формы?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Создать копию"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Создать копию"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Создать копию"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -934,7 +951,8 @@ msgstr ""
 "            Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n"
 "    "
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -953,11 +971,11 @@ msgstr "Редактировать"
 msgid "Edit body details"
 msgstr "Редактировать информацию об учреждении"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -1008,7 +1026,7 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Адрес эл. почты"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Адрес эл. почты добавлен в черный список"
 
@@ -1026,11 +1044,11 @@ msgstr "Создано уведомление по эл. почте"
 msgid "Email alert deleted"
 msgstr "Уведомление по эл. почте удалено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Этот адрес эл. почты уже находится в черном списке"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1104,7 +1122,7 @@ msgid "Enter details of the problem"
 msgstr "Подробно опишите проблему"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1126,8 +1144,8 @@ msgstr "Пример почтового индекса: %s"
 msgid "Examples:"
 msgstr "Примеры:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1163,7 +1181,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Дополнительная информация:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1185,11 +1204,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Исправьте это, выбрав <strong>зону покрытия</strong> в форме <em>Редактирование информации об учреждении</em>, расположенной ниже."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1197,12 +1217,12 @@ msgid "Fixed"
 msgstr "Исправлено"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Исправлено (орган самоуправления)"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Исправлено (пользователь)"
 
@@ -1220,7 +1240,7 @@ msgstr "Исправлено:"
 msgid "Flag as deleted"
 msgstr "Пометить как удаленное"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Пометить пользователя"
 
@@ -1241,7 +1261,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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Помечено:"
@@ -1279,7 +1299,7 @@ msgid "Frequently Asked Questions"
 msgstr "Часто задаваемые вопросы"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Получать обновления"
 
@@ -1305,7 +1325,7 @@ msgstr "Здорово, что проблема решена!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Поехали!"
@@ -1314,7 +1334,7 @@ msgstr "Поехали!"
 msgid "Going to send questionnaire?"
 msgstr "Собираетесь отправить опрос?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1356,8 +1376,8 @@ msgstr "Привет, %s!"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1400,7 +1420,7 @@ msgstr "Я сообщаю о проблеме на @fixmystreet"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Я обновляю информацию о проблеме на @fixmystreet"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Нам не удалось найти ваше обращение в базе данных.\n"
 
@@ -1450,6 +1470,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1519,7 +1543,7 @@ msgstr "Кроме того, возвращаются следующие пар
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1555,7 +1579,7 @@ msgid "Internal notes"
 msgstr "Внутренние заметки"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Внутренний реферал"
 
@@ -1563,7 +1587,7 @@ msgstr "Внутренний реферал"
 msgid "Invalid agency_responsible value %s"
 msgstr "Неверно задано значение agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Неверно указана дата окончания"
 
@@ -1571,16 +1595,16 @@ msgstr "Неверно указана дата окончания"
 msgid "Invalid format %s specified."
 msgstr "Неверно задан формат: %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Неверно указана дата начала"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1626,7 +1650,11 @@ msgstr "Последнее обновление:"
 msgid "Last&nbsp;update:"
 msgstr "Последнее&nbsp;обновление:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1671,6 +1699,10 @@ msgstr "КАРТА"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Карта"
@@ -1695,7 +1727,7 @@ msgstr "Помечено как решенный/закрытый вопрос 
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Сообщение"
 
@@ -1715,7 +1747,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Не найден параметр jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1723,7 +1755,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1735,7 +1767,7 @@ msgstr "Прошло модерацию в течение одного рабо
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1759,7 +1791,7 @@ msgstr ""
 msgid "Name"
 msgstr "Имя"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1771,7 +1803,7 @@ msgstr "Имя:"
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1873,7 +1905,7 @@ msgstr "Новый статус"
 msgid "New template"
 msgstr "Новый шаблон"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1888,7 +1920,7 @@ msgstr "Далее"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1909,7 +1941,7 @@ msgstr "Нет учреждения"
 msgid "No council"
 msgstr "Нет органа самоуправления"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Орган самоуправления не выбран"
 
@@ -1975,7 +2007,7 @@ msgstr ""
 "                о действиях их учреждения), а также возможность скрывать обращения или устанавливать специфические статусы обращений."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2053,15 +2085,15 @@ msgstr "Более давние <br>устраненные"
 msgid "Older <br>problems"
 msgstr "Давние <br>неполадки"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2107,13 +2139,13 @@ msgstr "Или данные о неполадках, отправленные с
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Вы также можете подписаться на уведомления, выбрав свой район или орган самоуправления:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2134,7 +2166,7 @@ msgid "Parent"
 msgstr "Родительская"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Частичная"
 
@@ -2168,7 +2200,7 @@ msgid "Phone number (optional)"
 msgstr "Номер телефона (необязательно)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2220,7 +2252,7 @@ msgstr "Поставить метку на карте"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2248,14 +2280,14 @@ msgid "Please check your email address is correct"
 msgstr "Проверьте правильность написания адреса эл. почты"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Выберите категорию"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Выберите тип имущества"
 
@@ -2279,13 +2311,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. "
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Введите текст сообщения"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2300,13 +2332,13 @@ msgid "Please enter a password"
 msgstr "Введите пароль"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Введите тему"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2319,7 +2351,7 @@ msgstr "Введите действующий адрес эл. почты"
 msgid "Please enter a valid email address"
 msgstr "Введите действующий адрес эл. почты"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Введите дополнительную информацию"
@@ -2352,8 +2384,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Введите свое полное имя. Эта информация необходима представителям органов самоуправления. Если вы не хотите, чтобы ваше полное имя отображалось на сайте, снимите галочку ниже."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2390,7 +2422,7 @@ msgstr "Подробно опишите проблему."
 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 "Заполните форму ниже: расскажите о неполадке, уточните местоположение. Постарайтесь предоставить как можно более подробную информацию."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Укажите, хотите ли вы еще один опросник"
 
@@ -2416,20 +2448,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Внимание:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Поясните, почему вы решили заново отправить это обращение"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Предоставьте не только фото, но и письменный комментарий"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Вы впервые отправляете обращение в ваш орган самоуправления?"
 
@@ -2445,7 +2477,7 @@ msgstr "Выберите рассылку"
 msgid "Please select the type of alert you want"
 msgstr "Выберите тип уведомления"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Сообщите о статусе неполадки: проблема была решена?"
 
@@ -2464,22 +2496,22 @@ msgstr "Напишите сообщение"
 msgid "Please write your update here"
 msgstr "Введите новые данные здесь"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Опубликовать"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Опубликовано анонимно (%s)"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Автор публикации: %s (<strong>%s</strong>), время публикации: %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Автор публикации: %s, время публикации: %s"
 
@@ -2495,7 +2527,8 @@ msgstr "Предыдущая"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2511,10 +2544,15 @@ msgstr "Конфиденциальность и файлы cookie"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Доступ ограничен"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Доступ ограничен"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Проблема"
@@ -2550,11 +2588,11 @@ msgstr "Смена статуса проблемы на основании ре
 msgid "Problems"
 msgstr "Проблемы"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Проблемы поблизости"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Проблемы на карте"
 
@@ -2566,7 +2604,7 @@ msgstr "Недавно решенные проблемы на сайте FixMySt
 msgid "Problems within %.1fkm of this location"
 msgstr "Проблемы в пределах %.1fkm от этого места"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2590,6 +2628,7 @@ msgstr "Проблемы в пределах этого места:"
 msgid "Property address:"
 msgstr "Адрес имущества:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Предоставить новые данные"
@@ -2607,12 +2646,17 @@ msgstr "Имя и пароль необязательны. Но когда вы
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Публичный ответ:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Публичный ответ:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2636,7 +2680,7 @@ msgstr "Опрос (%d) заполнен для проблемы «%d» (%s —
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Опрос (%d) отправлен для проблемы «%d»"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Опрос заполнен автором обращения"
 
@@ -2644,7 +2688,7 @@ msgstr "Опрос заполнен автором обращения"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-фид"
 
@@ -2672,7 +2716,7 @@ msgstr "%s: RSS-фид, в пределах района: %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-фид о проблемах поблизости"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2688,12 +2732,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS-фид о недавних проблемах поблизости"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-фид об обновлениях по этой проблеме"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Получать эл. письма об обновлениях по этой проблеме."
 
@@ -2715,7 +2759,7 @@ msgstr "Недавно <br>устранены"
 msgid "Recently reported problems"
 msgstr "Недавние обращения о проблемах"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2723,13 +2767,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Удалить пометку"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2737,7 +2783,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2751,7 +2797,8 @@ msgstr "Ответить пользователю:"
 msgid "Report"
 msgstr "Сообщить"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2761,6 +2808,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Сообщить о проблеме"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Сообщить об оскорбительном поведении"
@@ -2784,8 +2832,8 @@ msgstr "Сообщить о своей проблеме"
 msgid "Report, view, or discuss local problems"
 msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Сообщено анонимно в: %s"
 
@@ -2794,8 +2842,8 @@ msgstr "Сообщено анонимно в: %s"
 msgid "Reported before"
 msgstr "Сообщено ранее"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Автор обращения: %s, время отправки: %s"
 
@@ -2808,27 +2856,27 @@ msgstr "Автор обращения:"
 msgid "Reported in the %s category"
 msgstr "Обращение отнесено к категории: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Обращение (категория: %s) отправлено анонимно в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Анонимно отправлено через: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Отправлено через: %s, автор: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s"
 
@@ -2938,16 +2986,16 @@ msgstr "Дорога находится в ведении: %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2958,21 +3006,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении"
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Спутник"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "помечено как копия обращения"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -3009,6 +3062,10 @@ msgstr "Пользователи не найдены."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3052,27 +3109,27 @@ msgstr "Отправлено:"
 msgid "Service:"
 msgstr "Сервис:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Поделиться"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3146,7 +3203,7 @@ msgstr "Указана неверная ссылка"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "При подтверждении вашего обращения произошла ошибка."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3194,12 +3251,14 @@ msgstr "Дата начала:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Статус"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3239,7 +3298,7 @@ msgstr "Субкатегория: %s"
 msgid "Subdivision/Body"
 msgstr "Подразделение/учреждение"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Тема"
 
@@ -3256,7 +3315,7 @@ msgstr "Тема:"
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3282,7 +3341,7 @@ msgid "Submitted"
 msgstr "Отправлено"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -3565,7 +3624,7 @@ msgstr "При загрузке страницы «Все обращения» 
 msgid "There was a problem showing this page. Please try again later."
 msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3657,9 +3716,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Эта информация является обязательной"
@@ -3684,6 +3743,10 @@ msgstr "Эта проблема была решена"
 msgid "This problem has not been fixed"
 msgstr "Эта проблема не была решена"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3758,7 +3821,8 @@ msgstr "Просмотр точного местоположения данно
 msgid "Total"
 msgstr "Всего"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3766,7 +3830,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3783,14 +3847,14 @@ msgid "Try emailing us directly:"
 msgstr "Напишите нам:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Невозможно устранить"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3810,8 +3874,8 @@ msgstr "Неизв."
 msgid "Unknown alert type"
 msgstr "Неизвестный тип уведомления"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
@@ -3822,6 +3886,10 @@ msgstr "Неизвестная ошибка"
 msgid "Unknown problem ID"
 msgstr "Неизвестный идентификатор проблемы"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Обновление"
@@ -3875,7 +3943,7 @@ msgid "Updated"
 msgstr "Обновлено"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3890,7 +3958,7 @@ msgstr "Обновлено!"
 msgid "Updates"
 msgstr "Обновления"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение"
 
@@ -3921,11 +3989,11 @@ msgstr "Использованная карта"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Пометка удалена"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Аккаунт пользователя помечен"
 
@@ -3934,7 +4002,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4024,6 +4092,10 @@ msgstr "Когда были отредактированы данные"
 msgid "When sent"
 msgstr "Когда были отправлены данные"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4072,7 +4144,7 @@ msgstr "Год"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4087,11 +4159,11 @@ msgstr "Да"
 msgid "Yes I have a password"
 msgstr "Да, у меня есть пароль"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Вы считаете, что эта проблема не нуждалась в модерации:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:"
 
@@ -4108,7 +4180,7 @@ msgstr "Вы можете <a href=\"%s%s\">ознакомиться с проб
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Вы можете написать в службу технической поддержки: <a href='mailto:%s'>%s</a>"
 
@@ -4205,9 +4277,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4227,7 +4299,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей <a href=\"/privacy\">политикой конфиденциальности</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4306,53 +4378,53 @@ msgstr "редактировать информацию о пользовате
 msgid "from %s different users"
 msgstr "от разных пользователей (%s)"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "последнее обновление: %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "менее минуты"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "помечено как копия обращения"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "помечено как запланированное действие"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "помечено как внутренний реферал"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "помечено как закрытое"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "помечено как решенное"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "помечено как находящееся в процессе разрешения"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "помечено как находящееся в процессе расследования"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "помечено как вопрос вне ответственности органа управления"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "помечено как запланированное"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "помечено как проблема, которую невозможно устранить"
 
@@ -4398,8 +4470,8 @@ msgstr "введено: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "другие области"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "заново открыто"
 
@@ -4445,16 +4517,16 @@ msgstr "неполадка находится в собственности по
 msgid "ward"
 msgstr "район"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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> недавних обращения"
-msgstr[2] "<big>%s</big> недавних обращений"
-msgstr[3] "<big>%s</big> недавних обращений"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
+msgstr[3] "%d дней"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4463,16 +4535,7 @@ msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 msgstr[3] "%d часов"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d спонсор"
-msgstr[1] "%d спонсора"
-msgstr[2] "%d спонсоров"
-msgstr[3] "%d спонсоров"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4481,25 +4544,16 @@ msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 msgstr[3] "%d минут"
 
-#: 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] "<big>%s</big> обновление обращений"
-msgstr[1] "<big>%s</big> обновления обращений"
-msgstr[2] "<big>%s</big> обновлений обращений"
-msgstr[3] "<big>%s</big> обновлений обращений"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
-msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d спонсор"
+msgstr[1] "%d спонсора"
+msgstr[2] "%d спонсоров"
+msgstr[3] "%d спонсоров"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4508,6 +4562,15 @@ msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 msgstr[3] "%d недель"
 
+#: 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] "<big>%s</big> проблема решена за прошлый месяц"
+msgstr[1] "<big>%s</big> проблемы решены за прошлый месяц"
+msgstr[2] "<big>%s</big> проблем решено за прошлый месяц"
+msgstr[3] "<big>%s</big> проблем решено за прошлый месяц"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4517,23 +4580,23 @@ msgstr[1] "<big>%s</big> обращения за прошлую неделю"
 msgstr[2] "<big>%s</big> обращений за прошлую неделю"
 msgstr[3] "<big>%s</big> обращений за прошлую неделю"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> проблема решена за прошлый месяц"
-msgstr[1] "<big>%s</big> проблемы решены за прошлый месяц"
-msgstr[2] "<big>%s</big> проблем решено за прошлый месяц"
-msgstr[3] "<big>%s</big> проблем решено за прошлый месяц"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> недавнее обращение"
+msgstr[1] "<big>%s</big> недавних обращения"
+msgstr[2] "<big>%s</big> недавних обращений"
+msgstr[3] "<big>%s</big> недавних обращений"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d день"
-msgstr[1] "%d дня"
-msgstr[2] "%d дней"
-msgstr[3] "%d дней"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> обновление обращений"
+msgstr[1] "<big>%s</big> обновления обращений"
+msgstr[2] "<big>%s</big> обновлений обращений"
+msgstr[3] "<big>%s</big> обновлений обращений"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4543,3 +4606,12 @@ msgstr[0] "У нас пока <strong>нет</strong> подробной инф
 msgstr[1] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[2] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[3] "У нас пока <strong>нет</strong> подробной информации об органах самоуправления, в ведении которых находится это место."
+
+#: 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[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
+msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
index fb2c07012..d27cbeff6 100644
--- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sq.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Granit Zhubi <granitzhubi@gmail.com>, 2016\n"
 "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "dhe"
@@ -118,7 +118,7 @@ msgstr "%s lagje, %s"
 msgid "%s, within %s ward"
 msgstr "%s, brenda lagjes %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> kontribuesit"
 
@@ -126,7 +126,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Defekt &amp; lokacioni i defektit)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Email-i në tabelen abuzimi)"
@@ -150,12 +150,10 @@ msgstr "(nje distance e paracaktuar e cila mbulon pothuajse 200,000 persona)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(Ndryshe RSS mund të personalizohet, brenda% s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(i mbyllur)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(i rregulluar)"
@@ -164,7 +162,7 @@ msgstr "(i rregulluar)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(Si mbishkrime, pllaka të thyera , ose ndriçimit të rrugëve)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(nuk ju dergua kuvendit)"
 
@@ -172,21 +170,21 @@ msgstr "(nuk ju dergua kuvendit)"
 msgid "(optional)"
 msgstr "(opsionale)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(dërguar te të dy)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Zgjedh në kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Zgjedh nje lloj te karakteristikes --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Zgjedh një template--"
 
@@ -205,8 +203,8 @@ msgstr ""
 "              Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).<br>\n"
 "              Ndoshta shtoni disa <code>MAPIT_TYPES</code> ne skedarin tuaj te konfigurimit?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -231,11 +229,11 @@ msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Jo</strong> më lejo të kyqem me email"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<Strong> Shënim: </ strong> Ky raport është dërguar tutje për veprim. Çdo ndryshim i bërë tutje nuk do të kalojë."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<Strong> Shënim: </ strong> Ky raport nuk është dërguar ende në vazhdim për veprim. Çdo ndryshim i bërë nuk mund të kalohet."
 
@@ -246,7 +244,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Po</strong> Unë kam një fjalëkalim"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,26 +275,29 @@ msgstr "Shto trup"
 msgid "Add new category"
 msgstr "Shto një kategori të re"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Shto në listën e ngushtë"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Shto përdorues"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Shto/përditëso kategoritë e problemeve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Shto/përditëso prioritetet e përgjigjeve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Shto/Përditëso përgjigjet nga template"
 
@@ -304,7 +305,7 @@ msgstr "Shto/Përditëso përgjigjet nga template"
 msgid "Added %s"
 msgstr "Shtoi %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Duke shtuar këtë raport në listën tuaj do të heqni atë nga lista %s''s e ngushtë."
 
@@ -359,7 +360,7 @@ msgstr "Nje perditesim e ka perditesuar kete problem si te zgjidhur."
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonim:"
@@ -414,7 +415,7 @@ msgstr "Caktoja një drejtorije të jashtme:"
 msgid "Assign to subdivision:"
 msgstr "Cakto per nenndarje:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr "Cakto përdorues për ëonat"
 
@@ -439,8 +440,8 @@ msgstr "Përdoruesit e stafit te autorizuar mund të jenë të lidhur me kategor
 msgid "Auto-response:"
 msgstr "Përgjigje-Automatike:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Kategoritë në dispozicion"
 
@@ -448,7 +449,7 @@ msgstr "Kategoritë në dispozicion"
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Shmangni të dhënat personale dhe targat e automjeteve"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Në pritje të vlerësimit"
@@ -461,12 +462,12 @@ msgstr "Prapa"
 msgid "Back to all reports"
 msgstr "Prapa te të gjitha raportet"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "bllokoemail adresen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -497,10 +498,6 @@ msgstr "Nuk mund ta gjeni emailin tonë? Kontrolloni folderin spam ne e-mail. Kj
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Anulo"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -513,7 +510,8 @@ msgstr "Kategoritë:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -533,7 +531,7 @@ msgstr "Kategoria u ndryshua nga '%s' në '%s'"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Norma e rregullimit të kategorive për problemet > 4 javë"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -610,6 +608,10 @@ msgstr ""
 "Zgjidhni një emër të<strong> kategorisë </ strong> emër që ka kuptim për publikun (p.sh., \"\", \"ndriçimi publik\",\"Rruga Lokale\"), por është i kuptueshëm edhe për\n"
 "Drejtorinë. Këto do të shfaqen në drop-down menynë në faqen Raportimit të problemeve."
 
+#: templates/web/base/report/_inspect.html:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -638,10 +640,11 @@ msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -743,8 +746,8 @@ msgstr "Kontakto ekipin"
 msgid "Coordinates:"
 msgstr "Koordinatat:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Nuk mund te gjeni perdoruesin"
 
@@ -798,7 +801,7 @@ msgstr "Krijo raporte/përditësime si Kuvend Komunal"
 msgid "Create reports/updates on a user's behalf"
 msgstr "Krijo raport/përditësim në emër të shfrytëzuesit"
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Krijo template"
@@ -839,7 +842,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Trajtohet nga nën-drejtoritë brenda 5 ditëve të punës"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Fshije template"
@@ -905,21 +908,35 @@ msgstr "A keni vondosur nje %s fjalëkalim ?"
 msgid "Don&rsquo;t know"
 msgstr "Nuk e di"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Nuk i'u pelqen kjo forme?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Merr dhe lësho fotot këtu ose <u>kliko për të ngarkuar foto</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dyfisho"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Dyfisho"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Dyfisho"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -931,7 +948,8 @@ msgstr ""
 "kategoritë të ndryshme <strong> mund të kenë të njëjtin kontakt </ strong> (adresë e-mail).\n"
 "Kjo do të thotë që ju mund të shtoni shumë kategori edhe në qoftë se ju keni vetëm një kontakt për llojin e problemit"
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr "Lëvizje drejtë Lindjes/Veriut:"
 
@@ -950,11 +968,11 @@ msgstr "Përditëso"
 msgid "Edit body details"
 msgstr "Përditëso detajet:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "Përditëso detajet e përdoruesit"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "Përditëso autorizimet e përdoruesit"
 
@@ -1005,7 +1023,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Emaili u shtua te lista e abuzimeve"
 
@@ -1023,11 +1041,11 @@ msgstr "Notifikimi me email u krijua"
 msgid "Email alert deleted"
 msgstr "Notifikimi me email u fshi"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Emaili tanimë është në listë e abuzuesve"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1094,7 +1112,7 @@ msgid "Enter details of the problem"
 msgstr "Pershkruaje problemin"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1116,8 +1134,8 @@ msgstr "Shembull i kodit postar %s"
 msgid "Examples:"
 msgstr "Shembuj:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "Kategori ekzistuese"
 
@@ -1153,7 +1171,8 @@ msgstr "Ekipi i jashtëm"
 msgid "Extra data:"
 msgstr "Te dhena shtese:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "Ekstra detajet"
 
@@ -1175,11 +1194,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Rregulloni këtë duke zgjedhur një <strong> zonë të mbuluar </ strong> në detajet e trupit <em> Ndrysho </ em> formularin e mëposhtëm."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1187,12 +1207,12 @@ msgid "Fixed"
 msgstr "E rregulluar"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "E rregulluar - Këshilli"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "E rregulluar - Perdoruesi"
 
@@ -1210,7 +1230,7 @@ msgstr "E rregulluar:"
 msgid "Flag as deleted"
 msgstr "E fshirë"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Flamuri i perdoruesit"
 
@@ -1231,7 +1251,7 @@ msgstr "Përdoruesit e shënjuar janë të listuar në <a href='%s'> faqen e sh
 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 shënjuar nuk janë të kufizuar në asnjë mënyrë. Kjo është vetëm një listë e përdoruesve që kanë qenë të shënuar për vëmendje të mëtutjeshme."
 
-#: templates/web/base/admin/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Shënjuar:"
@@ -1269,7 +1289,7 @@ msgid "Frequently Asked Questions"
 msgstr "Pyetjet më të shpeshta"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Merr perditesimet"
 
@@ -1295,7 +1315,7 @@ msgstr "Jemi të kënaqur që është regulluar!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Vazhdo"
@@ -1304,7 +1324,7 @@ msgstr "Vazhdo"
 msgid "Going to send questionnaire?"
 msgstr "Do dërgoni pyetsorin?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "Lejoni akses për administratorin"
 
@@ -1346,8 +1366,8 @@ msgstr "Pershendetje %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1390,7 +1410,7 @@ msgstr "Unë sapo raportova një problem në @rregullorrugëntime"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Unë sapo përditësova një poroblem në @rregullorrugëntime"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n"
 
@@ -1436,6 +1456,10 @@ msgstr "Nëse ju vetëm dëshironi që kjo template të jetë një alternativë
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr "Në qoftë se ju do të paraqitni një problem këtu ,problemi do të <strong> nuk </ strong> të raportohet në këshill."
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1497,7 +1521,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1533,7 +1557,7 @@ msgid "Internal notes"
 msgstr "Shenim i brendshem"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Rekomandim i brendshem"
 
@@ -1541,7 +1565,7 @@ msgstr "Rekomandim i brendshem"
 msgid "Invalid agency_responsible value %s"
 msgstr "Vlerë agency_responsible e gabuar %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Data e fundit jovalide"
 
@@ -1549,16 +1573,16 @@ msgstr "Data e fundit jovalide"
 msgid "Invalid format %s specified."
 msgstr "Format jo i vlefshëm %s i specifikuar."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Lokacion jo valid. Lokacioni i ri duhet të mbulohet nga i njëjti këshill."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Data e fillimit jovalide"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1606,7 +1630,11 @@ msgstr "Perditesimi i fundit:"
 msgid "Last&nbsp;update:"
 msgstr "Perditesimi&nbsp;fundit:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr "I përditësuar kohët e fundit"
 
@@ -1651,6 +1679,10 @@ msgstr "HARTA"
 msgid "Manage shortlist"
 msgstr "Menaxhoni listën e shkurtë"
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Harta"
@@ -1675,7 +1707,7 @@ msgstr "Shëno si të rregulluar/mbyllyr në më shumë se 8 javë"
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Mesazh"
 
@@ -1695,7 +1727,7 @@ msgstr "Mungojnë drejtori:"
 msgid "Missing jurisdiction_id"
 msgstr "Mungesë juridiksioni_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr "Mesatare"
 
@@ -1703,7 +1735,7 @@ msgstr "Mesatare"
 msgid "Moderate report details"
 msgstr "Raportet e detajuara mesatare"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr "Moderoni këtë raport"
 
@@ -1715,7 +1747,7 @@ msgstr "Moderuar me divizion brenda një ditë pune"
 msgid "Month"
 msgstr "Muaji"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "Më të komentuarat"
 
@@ -1739,7 +1771,7 @@ msgstr "Më të komentuarat"
 msgid "Name"
 msgstr "Emri"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1751,7 +1783,7 @@ msgstr "Emri:"
 msgid "Name: %s"
 msgstr "Emri: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr "Shko tek ky problem"
 
@@ -1851,7 +1883,7 @@ msgstr "Gjendje e re"
 msgid "New template"
 msgstr "Shabllon i ri"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "Më e reja"
 
@@ -1866,7 +1898,7 @@ msgstr "Tjetra"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1887,7 +1919,7 @@ msgstr "Ska drejtori"
 msgid "No council"
 msgstr "Ska council"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Asnjë council  e zgjedhur"
 
@@ -1947,7 +1979,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2025,15 +2057,15 @@ msgstr "E vjeter <br>e kryer"
 msgid "Older <br>problems"
 msgstr "Probleme <br> te vjetra"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "Më i vjetri"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2079,13 +2111,13 @@ msgstr "Ose raportoni problemet n:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2106,7 +2138,7 @@ msgid "Parent"
 msgstr "Burim"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "I pjesshem"
 
@@ -2140,7 +2172,7 @@ msgid "Phone number (optional)"
 msgstr "Numri i telefonit (opsionale)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2192,7 +2224,7 @@ msgstr "Vendose shenjen ne harte"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2220,14 +2252,14 @@ msgid "Please check your email address is correct"
 msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Ju lutem zgjedhni kategorine"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Ju lutem zgjedhni tipin e pronës"
 
@@ -2248,13 +2280,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Ju lutem shkruaj nje mesazh"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Ju lutem shkruani emrin"
 
@@ -2269,13 +2301,13 @@ msgid "Please enter a password"
 msgstr "Ju lutem shkruaj fjalekalimin"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Ju lutem shkruaj subjektin"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2288,7 +2320,7 @@ msgstr "Ju lutem shkruaj nje email valid"
 msgid "Please enter a valid email address"
 msgstr "Ju lutem shkruani një email adresë valide"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Ju lutem shkruaj disa te dhena"
@@ -2321,8 +2353,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Ju lutem shkruani emrin tuaj të plotë, council i cili kërkon këtë informatë - nëse nuk doni që emri juaj të shihet në faqe, largoni etiketimin nga kutia e mëposhtme"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2359,7 +2391,7 @@ msgstr "Ju lutem të plotësoni në detaje problemin"
 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 "Ju lutem plotësoni formën e mëposhtme me detajet e problemit dhe përshkruani lokacionin sa më saktë që është e mundur në kutinë e detajeve."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ju lutem tregoni nëse ju do dëshironit të merrni një pyetsor tjetër"
 
@@ -2385,20 +2417,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Ju lutem vini re:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr "Ju lutem sigorni një përditësim publik për këtë raport"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Ju lutem na siguroni më shumë shpjegime se pse po ri-hapni këtë raport"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Ju lutem ofroni nje pershkrim si dhe nje fotografi"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Ju lutem na tregoni nëse keni raportuar ndonjë problem tek council i juaj më parë."
 
@@ -2414,7 +2446,7 @@ msgstr "Ju lutem zgjedhni furnizuesin qe deshironi"
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ju lutem tregoni nëse problemi është zgjedhur apo jo "
 
@@ -2433,22 +2465,22 @@ msgstr "Ju lutem shkruani nje mesazh"
 msgid "Please write your update here"
 msgstr "Ju lutem shkruani perditesimin tuaj ketu"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Posto"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Postuar ne menyre anonime ne %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Postuar nga  %s (<strong>%s</strong>) ne %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postuar nga %s ne %s"
 
@@ -2464,7 +2496,8 @@ msgstr "Paraprak"
 msgid "Priorities"
 msgstr "Prioritetet"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2480,10 +2513,15 @@ msgstr "Privatësia dhe cookiesa"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Ekstra detajet"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Problem"
@@ -2519,11 +2557,11 @@ msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes"
 msgid "Problems"
 msgstr "Problemet"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Problemet ne afersi"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problemet ne harte"
 
@@ -2535,7 +2573,7 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemet brenda %.1fkm te ketij lokacioni"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2559,6 +2597,7 @@ msgstr "Problemet brenda kufijve te:"
 msgid "Property address:"
 msgstr "Adresa e prones:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Ofro nje perditesim"
@@ -2576,12 +2615,17 @@ msgstr "Dhënia e emrit dhe fjalëkalimit janë opcionale, por nëse jepni këto
 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
 msgstr "Dhënia e fjalëkalimit është opcional, por duke dhënë atë do të ju lejohet që më lehtë të raportoni problemin, bëni përditësim dhe menaxhoni raportet tuaja."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Përditësim publik."
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Pergjigje publike:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr "Përditësim publik."
 
@@ -2605,7 +2649,7 @@ msgstr "Pyetsorë %d përgjigjur për probleme "
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Pyetsorë dërguar për problem"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Pyestor i plotësuar nga raportuesi i problemit"
 
@@ -2613,7 +2657,7 @@ msgstr "Pyestor i plotësuar nga raportuesi i problemit"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS feed"
 
@@ -2641,7 +2685,7 @@ msgstr "RSS feed i %s, brenda lagjes %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed i problemeve ne afersi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2657,12 +2701,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS feed nga problemet e fundit lokale"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS feed per te rejat rreth ketij problemi"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Prano email kur ka perditesime te ketij problemi"
 
@@ -2684,7 +2728,7 @@ msgstr "Rregullimet <br> e fundit"
 msgid "Recently reported problems"
 msgstr "Problemet e raportuara së fundmi"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr "Përditësuar së fundmi"
 
@@ -2692,13 +2736,15 @@ msgstr "Përditësuar së fundmi"
 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 në mend që FixMyStreet është për të raportuar problemet fizike primare që mund të rregullohen. Nëse problemi juaj nuk është i përshtashëm  tu dërguar përmes kësaj faqe mbani në mend që mund të kontaktoni përmes council tuaj direkt duke përdorur councin e tyre."
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Largo flamurin"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr "Fshije nga lista e ngushtë"
 
@@ -2706,7 +2752,7 @@ msgstr "Fshije nga lista e ngushtë"
 msgid "Remove from site"
 msgstr "Fshije nga website"
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2720,7 +2766,8 @@ msgstr "Përgjigju përdoruesit:"
 msgid "Report"
 msgstr "Raporto"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "ID e raportit:"
 
@@ -2730,6 +2777,7 @@ msgstr "ID e raportit:"
 msgid "Report a problem"
 msgstr "Raporto nje problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Raporto abuzimin"
@@ -2753,8 +2801,8 @@ msgstr "Raportoni problemin tuaj"
 msgid "Report, view, or discuss local problems"
 msgstr "Raporto,shiqo apo diskuto problemet lokale"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Raportuar ne menyre anonime te %s"
 
@@ -2763,8 +2811,8 @@ msgstr "Raportuar ne menyre anonime te %s"
 msgid "Reported before"
 msgstr "Të raportuara më parë"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Raportuar nga %s ne %s"
 
@@ -2777,27 +2825,27 @@ msgstr "Raportuar nga:"
 msgid "Reported in the %s category"
 msgstr "Raportuar ne kategorine %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Raportuar ne kategorine %s nga %s ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Raportuar nepermjet %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Raportuar nepermjet %s nga %s ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Raportuar nepermjet %s ne kategorine %s ne %s"
 
@@ -2907,16 +2955,16 @@ msgstr "Operatori i rrugës për emrin e kësaj rruge  (rrjedh nga numri i refer
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operatori i rrugës për emrin e kësaj rruge (nga OpenStreetMap)."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2927,21 +2975,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rrotullimi i kësaj foto do të heq dorë nga ndryshimet e paruajtura në raport."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satelitore"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "shenuar si raport i dyfishuar"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Ruaj ndryshimet"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr "Ruaje me një përditësim për publikun"
 
@@ -2978,6 +3031,11 @@ msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues."
 msgid "See our privacy policy"
 msgstr "Shiqo rregulloren tonë të privatësisë"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#, fuzzy
+msgid "See user detail for reports created as the council"
+msgstr "Krijo raporte/përditësime si Kuvend Komunal"
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3021,27 +3079,27 @@ msgstr "Dërgo:"
 msgid "Service:"
 msgstr "Shërbim:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr "Vendos tek lokacioni im i tanishëm"
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Shpërndajë"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr "Lista e ngushtë"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr "Përzgjedhur"
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr "Përzgjedhur nga %s"
 
@@ -3113,7 +3171,7 @@ msgstr "Na vjen keq, ai nuk ishte link valid"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Na vjen keq, është nje problem me konfirmimin e raportit tuaj."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3161,12 +3219,14 @@ msgstr "Data e Fillimit:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Gjendje"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3206,7 +3266,7 @@ msgstr "Nenkategoria: %s"
 msgid "Subdivision/Body"
 msgstr "Nëndivizioni/Drejtoria"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Tema"
 
@@ -3223,7 +3283,7 @@ msgstr "Tema:"
 msgid "Submit"
 msgstr "Dërgo"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3249,7 +3309,7 @@ msgid "Submitted"
 msgstr "Paraqitur"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Abonohu"
 
@@ -3530,7 +3590,7 @@ msgstr "Ka problem në hapjën e faqes Të gjitha raportet. Ju lutem provoni pë
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Ka probleme në hapjën e kësaj faqe. Ju lutem provoni përsëri më vonë."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3617,9 +3677,9 @@ msgstr "Ky email është dërguar të dy Drejtorite që mbulojnë vendndodhjen e
 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 email është dërguar në disa Drejtori që mbulojnë vendndodhjen e problemit, pasi që kategoria e zgjedhur është dhënë për të gjithë ata; ju lutemi ta injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Ky informacion është i nevojshëm"
@@ -3644,6 +3704,10 @@ msgstr "Ky problem ka qene i rregulluar"
 msgid "This problem has not been fixed"
 msgstr "Ky problem nuk ka qene i rregulluar"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3718,7 +3782,8 @@ msgstr "Për të parë një hartë të vendndodhjen e saktë të kësaj çështj
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr "Menaxhimi i trafikut i nevojshëm?"
 
@@ -3726,7 +3791,7 @@ msgstr "Menaxhimi i trafikut i nevojshëm?"
 msgid "Trusted by bodies:"
 msgstr "Të besuar nga Drejtoritë:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "I besuar për të bërë raporte të cilat nuk duhet të kontrollhen"
 
@@ -3743,14 +3808,14 @@ msgid "Try emailing us directly:"
 msgstr "Provoni për të na shkruar email direkt:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "E pamundur të zgjidhet"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3770,8 +3835,8 @@ msgstr "E panjohur"
 msgid "Unknown alert type"
 msgstr "Lloj i njoftimit i panjohur"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
@@ -3782,6 +3847,10 @@ msgstr "Gabim i panjohur"
 msgid "Unknown problem ID"
 msgstr "ID problemi i panjohur"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Perditesim"
@@ -3835,7 +3904,7 @@ msgid "Updated"
 msgstr "Perditesuar"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3850,7 +3919,7 @@ msgstr "Perditesuar!"
 msgid "Updates"
 msgstr "Perditesime"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr ""
 
@@ -3881,11 +3950,11 @@ msgstr "Harta të përdorura"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Flamuri i përdoruesit është hequr"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr ""
 
@@ -3894,7 +3963,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Përdoruesi gjen përputhje në kërkimet e emrit të përdoruesit dhe email adresës."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3984,6 +4053,10 @@ msgstr "Kur redaktohet"
 msgid "When sent"
 msgstr "Kur është dërguar"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Whoa Testino ! Tre foto janë të mjaftueshme."
@@ -4032,7 +4105,7 @@ msgstr "Viti"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4047,11 +4120,11 @@ msgstr "Po"
 msgid "Yes I have a password"
 msgstr "Po une kam nje fjalekalim"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 ""
 
@@ -4068,7 +4141,7 @@ msgstr "Ju mund <a href=\"%s%s\">te shihni problemin ne kete faqe</a>."
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Ju mund te kontaktoni per ndihme teknike ne <a href='mailto:%s'>%s</a>"
 
@@ -4159,9 +4232,9 @@ msgstr "Llogaria juaj"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4181,7 +4254,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Informatat tuaja do të përdoren në përputhje me politikën tonë të privatsisë"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4260,53 +4333,53 @@ msgstr "Ndryshoni përdoruesin"
 msgid "from %s different users"
 msgstr "nga %s perdorues te ndryshem"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Perditesimi i fundit %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "më pak se një minutë"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "shenuar si raport i dyfishuar"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "shenuar si veprim i planifikuar"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "shenuar si nje rekomandim i brendshem"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "shenuar si i mbyllur"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "shenuar si i rregulluar"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "shenuar si ne progres"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "shenuar si i shqyrtuar"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "shenuar si i planifikuar"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "Etiketuar si e pamundur për ta rregulluar"
 
@@ -4352,8 +4425,8 @@ msgstr "E dhënë origjinale"
 msgid "other areas:"
 msgstr "zona tjera:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "rihapur"
 
@@ -4399,55 +4472,48 @@ msgstr "perdoruesi eshte shkaktar i problemit"
 msgid "ward"
 msgstr "lagje"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ditë"
+msgstr[1] "%d dit"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d orë"
 msgstr[1] "%d orë"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d perkrahes"
-msgstr[1] "%d perkrahes"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutë"
 msgstr[1] "%d minuta"
 
-#: 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] "<big>%s</big> perditesim ne raporte"
-msgstr[1] "<big>%s</big> perditesime ne raporte"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] ""
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d perkrahes"
+msgstr[1] "%d perkrahes"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d javë"
 msgstr[1] "%d javë"
 
+#: 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] "<big>%s</big> e rregulluar ne muajin e kaluar"
+msgstr[1] "<big>%s</big> e rregulluar ne muajin e kaluar"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4455,19 +4521,19 @@ msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] "<big>%s</big> raport ne javen e fundit"
 msgstr[1] "<big>%s</big> raporte ne javen e fundit"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> e rregulluar ne muajin e kaluar"
-msgstr[1] "<big>%s</big> e rregulluar ne muajin e kaluar"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d ditë"
-msgstr[1] "%d dit"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> perditesim ne raporte"
+msgstr[1] "<big>%s</big> perditesime ne raporte"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4475,3 +4541,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 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] ""
+
+#~ msgid "Cancel"
+#~ msgstr "Anulo"
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 807e8a185..bf25313be 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jon Kristensen <info@jonkri.com>, 2016\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr " och "
@@ -110,7 +110,7 @@ msgstr "Administrativa området %s, %s"
 msgid "%s, within %s ward"
 msgstr "%s inom det administrativa området %s"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 
@@ -118,7 +118,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr "(Defekt &amp; defektens plats)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(Epost i missbrukstabellen)"
@@ -142,12 +142,10 @@ msgstr "(ett avstånd som täcker ungefär 200,000 invånare)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "(alternativt kan RSS-flödet konfigureras inom %s)"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(stängd)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(fixad)"
@@ -156,7 +154,7 @@ msgstr "(fixad)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(ej skickat till kommunen)"
 
@@ -164,21 +162,21 @@ msgstr "(ej skickat till kommunen)"
 msgid "(optional)"
 msgstr "(valfritt)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(skickat till båda)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Välj en katagori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Välj en fastighetstyp --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr "--Välj en mall--"
 
@@ -197,8 +195,8 @@ msgstr ""
 "              Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.<br>\n"
 "              Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Visa</label> %s <label for=\"filter_categories\">om</label> %s"
@@ -221,11 +219,11 @@ msgstr "<strong>Nej</strong> Låt mig bekräfta uppdateringen via epost"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nej</strong> Låt mig logga in med min epostadress"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras."
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras."
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Ja</strong>, jag har ett lösenord"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -265,26 +263,29 @@ msgstr "Lägg till förvaltning"
 msgid "Add new category"
 msgstr "Ny kategori"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr "Lägg till i slutlista"
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Lägg till användare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr "Lägg till eller ta bort problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr "Lägg till eller ta bort svarsprioriteringar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr "Lägg till eller ta bort svarsmallar"
 
@@ -292,7 +293,7 @@ msgstr "Lägg till eller ta bort svarsmallar"
 msgid "Added %s"
 msgstr "Lades till %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 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."
 
@@ -347,7 +348,7 @@ msgstr "En uppdatering markerade det här problemet som löst."
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonym:"
@@ -402,7 +403,7 @@ msgstr "Tilldela extern förvaltning:"
 msgid "Assign to subdivision:"
 msgstr "Tilldela underavdelning:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr "Tilldela användare till områden"
 
@@ -427,8 +428,8 @@ msgstr "Bemyndigade kommunanvändare kan vara associerade med de kategorier som
 msgid "Auto-response:"
 msgstr "Autosvar:"
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr "Tillgängliga kategorier"
 
@@ -436,7 +437,7 @@ msgstr "Tillgängliga kategorier"
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Undvik personlig information och nummerplåtar"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Väntar på att granskas"
@@ -449,12 +450,12 @@ msgstr "Tillbaka"
 msgid "Back to all reports"
 msgstr "Tillbaka till samtliga rapporter"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Förbjud epostadress"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -485,10 +486,6 @@ 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>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -501,7 +498,8 @@ msgstr "Kategorier:"
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -521,7 +519,7 @@ msgstr "Kategori ändrat från ‘%s’ till ‘%s’"
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -586,6 +584,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -614,10 +616,11 @@ msgstr "Klicka på länken i vårt bekräftelsemail för att logga in."
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -719,8 +722,8 @@ msgstr "Kontakta teamet"
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kan inte hitta användaren"
 
@@ -774,7 +777,7 @@ msgstr "Skapa rapporter/uppdateringar som kommunen"
 msgid "Create reports/updates on a user's behalf"
 msgstr "Skapa rapporter/uppdateringar på en användares vägnar"
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "Välj mall"
@@ -815,7 +818,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Hanterat av underavdelning inom 5 arbetsdagar"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "Ta bort mall"
@@ -881,21 +884,35 @@ msgstr "Har du ett lösenord för %s?"
 msgid "Don&rsquo;t know"
 msgstr "Vet ej"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Gillar du inte formulär?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Släpp foton här eller  <u>klicka för att ladda upp</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Finns redan"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Finns redan"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Finns redan"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -904,7 +921,8 @@ 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/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr "Easting/Northing:"
 
@@ -923,11 +941,11 @@ msgstr "Ändra"
 msgid "Edit body details"
 msgstr "Ändra förvaltningsdetaljer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr "Redigera andra användares uppgifter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr "Redigera andra användares rättigheter"
 
@@ -978,7 +996,7 @@ msgstr "Redaktör"
 msgid "Email"
 msgstr "Epost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Epostadressen tillagd till missbrukslistan"
 
@@ -996,11 +1014,11 @@ msgstr "E-postnotifikation skapad"
 msgid "Email alert deleted"
 msgstr "E-postnotifikation borttagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Epostadressen finns redan i missbrukslistan"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1070,7 +1088,7 @@ msgid "Enter details of the problem"
 msgstr "Skriv in information om problemet"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1092,8 +1110,8 @@ msgstr "Exempelpostnummer %s"
 msgid "Examples:"
 msgstr "Exempel:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr "Befintlig kategori"
 
@@ -1129,7 +1147,8 @@ msgstr "Externt arbetslag"
 msgid "Extra data:"
 msgstr "Extra data:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr "Extra uppgifter"
 
@@ -1151,11 +1170,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 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."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1163,12 +1183,12 @@ msgid "Fixed"
 msgstr "Löst"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Löst - Kommun"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Löst - Användare"
 
@@ -1186,7 +1206,7 @@ msgstr "Löst:"
 msgid "Flag as deleted"
 msgstr "Flagga som borttagen"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Flagga användare"
 
@@ -1207,7 +1227,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Flaggat:"
@@ -1245,7 +1265,7 @@ msgid "Frequently Asked Questions"
 msgstr "Vanliga frågor"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Få uppdateringar"
 
@@ -1271,7 +1291,7 @@ msgstr "Vi är glada att höra att det har blivit löst!"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Gå"
@@ -1280,7 +1300,7 @@ msgstr "Gå"
 msgid "Going to send questionnaire?"
 msgstr "Skicka enkät?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr "Bevilja tillgång till administratörskontrollpanelen"
 
@@ -1322,8 +1342,8 @@ msgstr "Hej %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1366,7 +1386,7 @@ msgstr "Jag rapporterade precis ett problem på @fixamingata"
 msgid "I just updated a problem on @fixmystreet"
 msgstr "Jag uppdaterade precis ett problem på @fixamingata"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n"
 
@@ -1412,6 +1432,10 @@ 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/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1471,7 +1495,7 @@ msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikat
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1507,7 +1531,7 @@ msgid "Internal notes"
 msgstr "Interna anteckningar"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Interna refereringar"
 
@@ -1515,7 +1539,7 @@ msgstr "Interna refereringar"
 msgid "Invalid agency_responsible value %s"
 msgstr "Inkorrekt värde för agency_responsible, \"%s\""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Inkorrekt slutdatum"
 
@@ -1523,16 +1547,16 @@ msgstr "Inkorrekt slutdatum"
 msgid "Invalid format %s specified."
 msgstr "Inkorrekt format %s angivet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Inkorrekt startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1578,7 +1602,11 @@ msgstr "Senaste uppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Senaste&nbsp;uppdatering:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr "Tidigast uppdaterad"
 
@@ -1623,6 +1651,10 @@ msgstr "KARTA"
 msgid "Manage shortlist"
 msgstr "Hantera slutlista"
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Karta"
@@ -1647,7 +1679,7 @@ msgstr "Markerad som löst/stängd för mer än åtta veckor sedan"
 msgid "Markup problem details"
 msgstr "Lägg till problemdetaljer"
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Meddelande"
 
@@ -1667,7 +1699,7 @@ msgstr "Saknade förvaltningar:"
 msgid "Missing jurisdiction_id"
 msgstr "Saknat jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr "Moderera"
 
@@ -1675,7 +1707,7 @@ msgstr "Moderera"
 msgid "Moderate report details"
 msgstr "Moderera rapportdetaljer"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr "Moderera den här rapporten"
 
@@ -1687,7 +1719,7 @@ msgstr "Granskat av underavdelningen inom en arbetsdag"
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr "Mest kommenterad"
 
@@ -1711,7 +1743,7 @@ msgstr "Mest kommenterad"
 msgid "Name"
 msgstr "Namn"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1723,7 +1755,7 @@ msgstr "Namn:"
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr "Navigera till det här problemet"
 
@@ -1825,7 +1857,7 @@ msgstr "Ny status"
 msgid "New template"
 msgstr "Ny mall"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr "Senaste"
 
@@ -1840,7 +1872,7 @@ msgstr "Nästa"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1861,7 +1893,7 @@ msgstr "Ingen förvaltning"
 msgid "No council"
 msgstr "Ingen kommun"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Ingen kommun vald"
 
@@ -1923,7 +1955,7 @@ msgid ""
 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/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2001,15 +2033,15 @@ msgstr "Äldre <br>fixat"
 msgid "Older <br>problems"
 msgstr "Äldre <br>problem"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr "Äldst"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2055,13 +2087,13 @@ msgstr "Eller problem rapporterade til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2082,7 +2114,7 @@ msgid "Parent"
 msgstr "Förälder"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Partiell"
 
@@ -2116,7 +2148,7 @@ msgid "Phone number (optional)"
 msgstr "Telefonnummer (valfritt)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2168,7 +2200,7 @@ msgstr "Placera nålen på kartan"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2196,14 +2228,14 @@ msgid "Please check your email address is correct"
 msgstr "Vänligen kontrollera att din epostadress är korrekt"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Välj en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Välj en fastighetstyp"
 
@@ -2224,13 +2256,13 @@ 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."
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Skriv in ett meddelande"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr "Skriv in ett namn"
 
@@ -2245,13 +2277,13 @@ msgid "Please enter a password"
 msgstr "Skriv in ett lösenord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Skriv in ett ärende"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2264,7 +2296,7 @@ msgstr "Skriv in en giltig epostadress"
 msgid "Please enter a valid email address"
 msgstr "Skriv in en giltig epostadress"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Skriv några detaljer"
@@ -2297,8 +2329,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2335,7 +2367,7 @@ msgstr "Fyll i information om problemet nedan."
 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 "Fyll i information om problemet nedan och beskriv den exakta platsen för problemet så noga du kan."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Ange ifall du vill ta emot ett annat frågeformulär"
 
@@ -2361,20 +2393,20 @@ msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>.
 msgid "Please note:"
 msgstr "Observera:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 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:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 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:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 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"
 
@@ -2390,7 +2422,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ange om problemet har lösts eller ej"
 
@@ -2409,22 +2441,22 @@ msgstr "Skriv ett meddelande"
 msgid "Please write your update here"
 msgstr "Skriv din uppdatering här"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Skicka"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Postat anonymt %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Postat av %s (<strong>%s</strong>) %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postat av %s %s"
 
@@ -2440,7 +2472,8 @@ msgstr "Föregående"
 msgid "Priorities"
 msgstr "Prioriteringar"
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -2456,10 +2489,15 @@ msgstr "Integritetsskydd och kakor"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Privat"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Extra uppgifter"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Rapport"
@@ -2495,11 +2533,11 @@ msgstr "Problemets status ändrats baserat på utredningsresultat"
 msgid "Problems"
 msgstr "Problem"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Närliggande problem"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Problem på kartan"
 
@@ -2511,7 +2549,7 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problem inom %.1f km från denna position"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2535,6 +2573,7 @@ msgstr "Problem inom gränsen för:"
 msgid "Property address:"
 msgstr "Fastighetsadress:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Ge en uppdatering"
@@ -2552,12 +2591,17 @@ msgstr "Du måste inte ange namn och ett lösenord men om du gör det är det l
 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 anmälningar."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Offentlig uppdatering:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Offentligt svar:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr "Offentlig uppdatering:"
 
@@ -2581,7 +2625,7 @@ msgstr "Frågeformulär %d svarat för problem %d, %s till %s"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Frågeformulär %d skickat för problem %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Frågeformulär ifyllt av rapportören"
 
@@ -2589,7 +2633,7 @@ msgstr "Frågeformulär ifyllt av rapportören"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS-flöde"
 
@@ -2617,7 +2661,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2633,12 +2677,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS-flöde för senaste lokala problemen"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-flöde för uppdateringar till denna rapport"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhåll epost när uppdateringar ges till denna rapport"
 
@@ -2660,7 +2704,7 @@ msgstr "Nyligen <br>åtgärdat"
 msgid "Recently reported problems"
 msgstr "Senaste rapporterade problemen"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr "Senast uppdaterad"
 
@@ -2668,13 +2712,15 @@ msgstr "Senast uppdaterad"
 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Ta bort flagga"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr "Ta bort från slutlista"
 
@@ -2682,7 +2728,7 @@ msgstr "Ta bort från slutlista"
 msgid "Remove from site"
 msgstr "Ta bort från sajten"
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2696,7 +2742,8 @@ msgstr "Besvara användare:"
 msgid "Report"
 msgstr "Rapportera"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
@@ -2706,6 +2753,7 @@ msgstr "Rapport-ID:"
 msgid "Report a problem"
 msgstr "Rapportera ett problem"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Rapportera missbruk"
@@ -2729,8 +2777,8 @@ msgstr "Rapportera ditt problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportera, visa, eller diskutera lokala problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapporterat anonymt %s"
 
@@ -2739,8 +2787,8 @@ msgstr "Rapporterat anonymt %s"
 msgid "Reported before"
 msgstr "Rapporterat tidigare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Rapporterat av %s den %s"
 
@@ -2753,27 +2801,27 @@ msgstr "Rapporterad av:"
 msgid "Reported in the %s category"
 msgstr "Rapporterat i kategori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anonym rapport i kategori %s, %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporterat i kategori %s av %s den %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Rapporterat av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporterat av %s av %s den %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporterat av %s i kategorin %s av %s den %s"
 
@@ -2883,16 +2931,16 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens numm
 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"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2903,21 +2951,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rotation av detta foto kommer att radera osparade rapportändringar."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Satellit"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "markerad som dubblett av rapport"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr "Spara med en offentlig uppdatering"
 
@@ -2954,6 +3007,11 @@ msgstr "Inga användare hittades."
 msgid "See our privacy policy"
 msgstr "Se vår integritetsskyddspolicy"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#, fuzzy
+msgid "See user detail for reports created as the council"
+msgstr "Skapa rapporter/uppdateringar som kommunen"
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2997,27 +3055,27 @@ msgstr "Skickades:"
 msgid "Service:"
 msgstr "Tjänst:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr "Sätt till min nuvarande position"
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Dela"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr "Slutlista"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr "Satt på slutlistan"
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr "Satt på slutlistan av %s"
 
@@ -3091,7 +3149,7 @@ msgstr "Länken är tyvärr ogiltig"
 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3139,12 +3197,14 @@ msgstr "Startdatum:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3184,7 +3244,7 @@ msgstr "Underkategori: %s"
 msgid "Subdivision/Body"
 msgstr "Underavdelning/Förvaltning"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Ärende"
 
@@ -3201,7 +3261,7 @@ msgstr "Ärende:"
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3227,7 +3287,7 @@ msgid "Submitted"
 msgstr "Skickad"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -3498,7 +3558,7 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3580,9 +3640,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Den här informationen krävs"
@@ -3607,6 +3667,10 @@ msgstr "Det här problemet har lösts"
 msgid "This problem has not been fixed"
 msgstr "Det här problemet har inte lösts"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3681,7 +3745,8 @@ msgstr "För att visa en karta med den exakta positionen för problemet"
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr "Krävs trafikövervakning?"
 
@@ -3689,7 +3754,7 @@ msgstr "Krävs trafikövervakning?"
 msgid "Trusted by bodies:"
 msgstr "Anförtrodd av kommunen:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Anförtrodd att skapa rapporter som inte behöver bli inspekterade"
 
@@ -3706,14 +3771,14 @@ msgid "Try emailing us directly:"
 msgstr "Prova att skicka ett e-brev till oss direkt:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Kunde inte åtgärda"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3733,8 +3798,8 @@ msgstr "Okänt"
 msgid "Unknown alert type"
 msgstr "Okänd feltyp"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Okänt fel"
@@ -3745,6 +3810,10 @@ msgstr "Okänt fel"
 msgid "Unknown problem ID"
 msgstr "Okänt problemnummer"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Uppdatering"
@@ -3798,7 +3867,7 @@ msgid "Updated"
 msgstr "Uppdaterad"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3813,7 +3882,7 @@ msgstr "Uppdaterad!"
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Uppdateringar kan inte innehålla mer än %s tecken. Var vänlig korta ned din uppdatering."
 
@@ -3844,11 +3913,11 @@ msgstr "Använde kartan"
 msgid "User ID to attribute fetched comments to"
 msgstr "Användar-ID att attribuera hämtade kommentarer till"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Användarflaggan borttagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Användaren flaggad"
 
@@ -3857,7 +3926,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Användarsökningen matchar mot användares namn och e-postadresser."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3947,6 +4016,10 @@ msgstr "Vid förändringar"
 msgid "When sent"
 msgstr "Vid avsändning"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Du kan som mest ladda upp tre foton."
@@ -3995,7 +4068,7 @@ msgstr "År"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4010,11 +4083,11 @@ msgstr "Ja"
 msgid "Yes I have a password"
 msgstr "Ja, jag har ett lösenord"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du anmäler att den här problemrapporten var modererad i onödan:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande rapport:"
 
@@ -4031,7 +4104,7 @@ msgstr "Du kan <a href=\"%s%s\">se problemet på den här webbplatsen</a>."
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Du kan kontakta teknisk support på <a href='mailto:%s'>%s</a>."
 
@@ -4122,9 +4195,9 @@ msgstr "Ditt konto"
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4144,7 +4217,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Din information kommer endast att användas i enlighet med vår <a href=\"/privacy\">sekretesspolicy</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4223,53 +4296,53 @@ msgstr "ändra användare"
 msgid "from %s different users"
 msgstr "från %s olika användare"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "senast uppdaterad %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "mindre än en minut"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "markerad som dubblett av rapport"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markerad som åtgärd schemalagd"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "markerad som intern referering"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "markerad som stängd"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "markerad som löst"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "markerad som pågående"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "markerad som under utredning"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markerad som ej kommunens ansvar"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "markerad som planerad"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "markerad som kunde inte åtgärda"
 
@@ -4315,8 +4388,8 @@ msgstr "ursprungligen inmatat: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andra områden:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "öppnat på nytt"
 
@@ -4362,55 +4435,48 @@ msgstr "användaren är inte problemägare"
 msgid "ward"
 msgstr "område"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dagar"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d supporter"
-msgstr[1] "%d supportrar"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: 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] "<big>%s</big> uppdatering av rapporter"
-msgstr[1] "<big>%s</big> uppdateringar av rapporter"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "Vi har ännu ingen information om kommunen på den platsen"
-msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d supporter"
+msgstr[1] "%d supportrar"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d vecka"
 msgstr[1] "%d veckor"
 
+#: 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] "<big>%s</big> löst problem senaste månaden"
+msgstr[1] "<big>%s</big> lösta problem senaste månaden"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4418,19 +4484,19 @@ 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-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"
+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"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dagar"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> uppdatering av rapporter"
+msgstr[1] "<big>%s</big> uppdateringar av rapporter"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4438,3 +4504,13 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
 msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
 msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen på den platsen"
 msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
+
+#: 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] "Vi har ännu ingen information om kommunen på den platsen"
+msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 951df1f0c..e73754901 100644
--- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/tr_TR.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "ve"
@@ -110,7 +110,7 @@ msgstr "%s bölüm, %s"
 msgid "%s, within %s ward"
 msgstr "%s, içinde %s bölüm"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 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"
 
@@ -118,7 +118,7 @@ msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap<
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(E-posta kara listede)"
@@ -142,12 +142,10 @@ msgstr "(yaklaşık 200,000 kişiyi kapsayan bir mesafe)"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(kapalı)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(onarıldı)"
@@ -156,7 +154,7 @@ msgstr "(onarıldı)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya da sokak aydınlatma gibi)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(kurula gönderilmemiş)"
 
@@ -164,21 +162,21 @@ msgstr "(kurula gönderilmemiş)"
 msgid "(optional)"
 msgstr "(isteğe bağlı)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(her ikisine de gönderildi)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Kategori seçiniz--"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Bir özellik seçiniz --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -197,8 +195,8 @@ msgstr ""
 "Bu muhtemelen \"kapalı alanın\" neden boş olduğunu(aşağıda)<br>\n"
 "Belkide yapılandırma dosyanıza bazı <code>MAPIT_TYPES</code> eklemelisiniz?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izi
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Hayır</strong> e-posta yoluyla giriş yapmama izin ver"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Evet</strong> şifrem var"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -269,26 +267,29 @@ msgstr "Bölüm ekle"
 msgid "Add new category"
 msgstr "Yeni kategori ekle"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Kullanıcı ekle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -296,7 +297,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Eklenmiş %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -351,7 +352,7 @@ msgstr "Bir güncelleştirme sorun giderildi olarak işaretlenmiş. "
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Anonim:"
@@ -406,7 +407,7 @@ msgstr "Dışarıdan bir organ atamak:"
 msgid "Assign to subdivision:"
 msgstr "Alt bölüm atamak:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -431,8 +432,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -440,7 +441,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Denetleme bekliyor"
@@ -453,12 +454,12 @@ msgstr "Geri"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Email adresini engelle"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -489,10 +490,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -505,7 +502,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -525,7 +523,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -600,6 +598,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -628,10 +630,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -733,8 +736,8 @@ msgstr "Grupla bağlantı kur"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Kullanıcı bulunamadı"
 
@@ -788,7 +791,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -829,7 +832,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Alt komisyon tarafından 5 iş günü içinde üstesinden gelinilecek"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -895,21 +898,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Don&rsquo;t know"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Şekilleri beğenmediniz mi?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Çoğaltmak"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Çoğaltmak"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Çoğaltmak"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -918,7 +935,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -937,11 +955,11 @@ msgstr "Ekle"
 msgid "Edit body details"
 msgstr "Bölümün detaylarını düzenle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -992,7 +1010,7 @@ msgstr "Editör"
 msgid "Email"
 msgstr "E-posta"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "E-posta kara listeye eklendi"
 
@@ -1010,11 +1028,11 @@ msgstr "E-posta uyarısı oluşturuldu"
 msgid "Email alert deleted"
 msgstr "E-posta uyarısı silindi"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "E-posta kara listede"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1085,7 +1103,7 @@ msgid "Enter details of the problem"
 msgstr "Problem hakkında detaylı bilgi giriniz"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1107,8 +1125,8 @@ msgstr "Örnek postakodu "
 msgid "Examples:"
 msgstr "Örnekler:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1144,7 +1162,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "İlave veriler:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1166,11 +1185,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1178,12 +1198,12 @@ msgid "Fixed"
 msgstr "Sorun çözüldü"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Sorun çözüldü- Kurul"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Sorun çözüldü- Kullanıcı"
 
@@ -1201,7 +1221,7 @@ msgstr "Sorun çözüldü:"
 msgid "Flag as deleted"
 msgstr "Silindi olarak seçildi"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Kullanıcıyı seç"
 
@@ -1222,7 +1242,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Seçilenler:"
@@ -1260,7 +1280,7 @@ msgid "Frequently Asked Questions"
 msgstr "Sıkça Sorulan Sorular"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Güncellemeleri yap"
 
@@ -1286,7 +1306,7 @@ msgstr "Problemin çözüldüğünü duymak güzel"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Git"
@@ -1295,7 +1315,7 @@ msgstr "Git"
 msgid "Going to send questionnaire?"
 msgstr "Anket gönderecek misiniz?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1337,8 +1357,8 @@ msgstr "Merhaba %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1381,7 +1401,7 @@ msgstr "@fixmystreet'e bir problemi henüz bildirdim."
 msgid "I just updated a problem on @fixmystreet"
 msgstr "@fixmystreet'teki problemi yeni güncelledim"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n"
 
@@ -1427,6 +1447,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1486,7 +1510,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1522,7 +1546,7 @@ msgid "Internal notes"
 msgstr "İç notlar"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "İç yönlendirme"
 
@@ -1530,7 +1554,7 @@ msgstr "İç yönlendirme"
 msgid "Invalid agency_responsible value %s"
 msgstr "Geçersiz ajans_sorumlu değer %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Geçersiz bitiş tarihi"
 
@@ -1538,16 +1562,16 @@ msgstr "Geçersiz bitiş tarihi"
 msgid "Invalid format %s specified."
 msgstr "Geçersiz format %s belirlenmiş."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Geçersiz başlangıç tarihi"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1593,7 +1617,11 @@ msgstr "Son güncelleme:"
 msgid "Last&nbsp;update:"
 msgstr "Son&nbsp;güncelleme:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1638,6 +1666,10 @@ msgstr "HARİTA"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "Harita"
@@ -1662,7 +1694,7 @@ msgstr "8 haftadan daha uzun bir süre önce halledilmiş/kapatılmış olarak i
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "İleti"
 
@@ -1682,7 +1714,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Eksik yetki_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1690,7 +1722,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1702,7 +1734,7 @@ msgstr "Bir iş gününe bölünmüş bir şekilde yönetilmiştir"
 msgid "Month"
 msgstr "Ay"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1726,7 +1758,7 @@ msgstr ""
 msgid "Name"
 msgstr "İsim"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1738,7 +1770,7 @@ msgstr "İsim:"
 msgid "Name: %s"
 msgstr "İsim: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1838,7 +1870,7 @@ msgstr "Yeni durum"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1853,7 +1885,7 @@ msgstr "Sonraki"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1874,7 +1906,7 @@ msgstr "Birim yok"
 msgid "No council"
 msgstr "Kurul yok"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Seçilmiş kurul yok"
 
@@ -1934,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,15 +2044,15 @@ msgstr "Geçmişte <br>onarılmış"
 msgid "Older <br>problems"
 msgstr "Eski <br>sorunlar"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2066,13 +2098,13 @@ msgstr "Veya 'e bildirilen sorunlar:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2093,7 +2125,7 @@ msgid "Parent"
 msgstr "Ebeveyn"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Kısmi"
 
@@ -2127,7 +2159,7 @@ msgid "Phone number (optional)"
 msgstr "Telefon numarası (isteğe bağlı)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2179,7 +2211,7 @@ msgstr "Harita üzerine işaretleyin"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2207,14 +2239,14 @@ msgid "Please check your email address is correct"
 msgstr "E-posta adresinizin doğruluğunu kontrol ediniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Kategori seçiniz"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Bir özellik seçin"
 
@@ -2235,13 +2267,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Mesaj giriniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2256,13 +2288,13 @@ msgid "Please enter a password"
 msgstr "Şifre giriniz"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Konu giriniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2275,7 +2307,7 @@ msgstr "Geçerli e-posta giriniz"
 msgid "Please enter a valid email address"
 msgstr "Geçerli e-posta adresi giriniz"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Lütfen bir kaç ayrıntı giriniz"
@@ -2308,8 +2340,8 @@ msgid "Please enter your full name, councils need this information – if you do
 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."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2346,7 +2378,7 @@ msgstr "Lütfen probleme ait ayrıntıları giriniz."
 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 "Lütfen aşağıda verilen formu problemin detayları ile ilgili doldurunuz ve konumu detay kutucuğu içerisine mümkün oldukça yakın bir şekilde tarif ediniz."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Başka bir anket doldurmak istediğinizi belirtiniz."
 
@@ -2372,20 +2404,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Lütfen dikkat:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 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:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Hem metin hem de fotoğraf ekleyiniz"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Bir kurula daha önce sorun bildirip bildirmediğinizi belirtin"
 
@@ -2401,7 +2433,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:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lütfen"
 
@@ -2420,22 +2452,22 @@ msgstr "Mesaj gönderin"
 msgid "Please write your update here"
 msgstr "Güncellemeleri buraya yazınız"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Paylaş"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "%s Anonim olarak gönderildi"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "%s (<strong>%s</strong>) tarafından %s 'te paylaşılmıştır"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Tarafından paylaşıldı %s saat %s"
 
@@ -2451,7 +2483,8 @@ msgstr "Önceki"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2467,10 +2500,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Özel"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Özel"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Sorun"
@@ -2506,11 +2544,11 @@ msgstr "Araştırma sonucu göz önünde bulundurularak problemin durumundaki de
 msgid "Problems"
 msgstr "Sorunlar"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Çevredeki problemler"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Haritadaki problemler"
 
@@ -2522,7 +2560,7 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble
 msgid "Problems within %.1fkm of this location"
 msgstr "Konumun %.1fkm içerisinde yer alan sorunlar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2546,6 +2584,7 @@ msgstr "İlgilenilen kısım içinde yer alan sorunlar:"
 msgid "Property address:"
 msgstr "Emlak adresi:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Güncellemeye izin ver"
@@ -2563,12 +2602,17 @@ msgstr "İsim ve şifre edinmek isteğe bağlıdır, fakat şifre almış olman
 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."
 
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Toplumsal geri bildirim:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Toplumsal geri bildirim:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2592,7 +2636,7 @@ msgstr "%s den %s 'e cevaplanan %d sorunun %d anketi"
 msgid "Questionnaire %d sent for problem %d"
 msgstr "%d sorunu için gönderilen %d anket"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Anket sorun bildirici tarafından dolduruldu"
 
@@ -2600,7 +2644,7 @@ msgstr "Anket sorun bildirici tarafından dolduruldu"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS besleme"
 
@@ -2628,7 +2672,7 @@ 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:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2644,12 +2688,12 @@ msgid "RSS feed of recent local problems"
 msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "Bu problemin güncellemelerini RSS olarak besle"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Bu sorunda herhangi bir güncelleme olduğunda e-posta ile bildir."
 
@@ -2671,7 +2715,7 @@ msgstr "Yakın zamanda <br>onarılmış"
 msgid "Recently reported problems"
 msgstr "Yakın zamanda bildirilen problemler"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2679,13 +2723,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "İşareti kaldır"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2693,7 +2739,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2707,7 +2753,8 @@ msgstr ""
 msgid "Report"
 msgstr "Bildirim"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2717,6 +2764,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Bir problem bildir"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Kötüye kullanım bildir"
@@ -2740,8 +2788,8 @@ msgstr "Probleminizi bildirin"
 msgid "Report, view, or discuss local problems"
 msgstr "Yerel problemleri bildir, göster ve tartış"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "%s 'e ananim olarak bildirilmiş"
 
@@ -2750,8 +2798,8 @@ msgstr "%s 'e ananim olarak bildirilmiş"
 msgid "Reported before"
 msgstr "Önceden bildirilmiş"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "%s tarafından %s de bildirilmiştir"
 
@@ -2764,27 +2812,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "%s kategorisine bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s kategorisine anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 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:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "%s yoluyla %s tarafından %s da bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 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:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 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"
 
@@ -2894,16 +2942,16 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Sola Yerleştir"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2914,21 +2962,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "Uydu"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "tekrarlanmış bildirim olarak işaretle"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2965,6 +3018,10 @@ msgstr "Arama sonucu kullanıcı bulunamadı"
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3008,27 +3065,27 @@ msgstr "gönderildi:"
 msgid "Service:"
 msgstr "Hizmet:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Paylaş"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3100,7 +3157,7 @@ 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:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3148,12 +3205,14 @@ msgstr "Başlangıç Tarihi:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Devlet"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3193,7 +3252,7 @@ msgstr "Alt kategori: %s"
 msgid "Subdivision/Body"
 msgstr "Alt bölüm/Bölüm"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Konu"
 
@@ -3210,7 +3269,7 @@ msgstr "Konu:"
 msgid "Submit"
 msgstr "Kaydet"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3236,7 +3295,7 @@ msgid "Submitted"
 msgstr "Kaydedildi"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Kaydet"
 
@@ -3507,7 +3566,7 @@ msgstr "Tüm Bildirimlerin görüntülendiği sayfada bir sorun var. Lütfen dah
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3589,9 +3648,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Bu bilgi gereklidir"
@@ -3616,6 +3675,10 @@ msgstr "Bu problem çözüldü"
 msgid "This problem has not been fixed"
 msgstr "Bu problem giderilemedi"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3690,7 +3753,8 @@ msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için"
 msgid "Total"
 msgstr "Toplam"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3698,7 +3762,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3715,14 +3779,14 @@ msgid "Try emailing us directly:"
 msgstr "Direkt olarak e-posta gönderin:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Onarımı mümkün değil"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3742,8 +3806,8 @@ msgstr "Bilinmeyen"
 msgid "Unknown alert type"
 msgstr "Bilinmeyen uyarı tipi"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
@@ -3754,6 +3818,10 @@ msgstr "Bilinmeyen hata"
 msgid "Unknown problem ID"
 msgstr "Bilinmeyen ID problemi"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Güncelleme"
@@ -3807,7 +3875,7 @@ msgid "Updated"
 msgstr "Güncellendi"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3822,7 +3890,7 @@ msgstr "Güncellendi!"
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 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."
 
@@ -3853,11 +3921,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Kullanıcı etiketi kaldırıldı"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Kullanıcı etiketlendi"
 
@@ -3866,7 +3934,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur."
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3956,6 +4024,10 @@ msgstr "Yayınlandığında"
 msgid "When sent"
 msgstr "Gönderildiğinde"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4004,7 +4076,7 @@ msgstr "Yıl"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4019,11 +4091,11 @@ msgstr "Evet"
 msgid "Yes I have a password"
 msgstr "Evet şifrem var"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Bu problem bildirimini gereksiz bir şekilde yönetildiği için şikayet ediyorsun:"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: "
 
@@ -4040,7 +4112,7 @@ msgstr "Problemi <a href=\"%s%s\">bu site üzerinde görüntüleyebilir siniz</a
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Teknik destek için <a href='mailto:%s'>%s</a> iletişime geçebilirsiniz."
 
@@ -4133,9 +4205,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4155,7 +4227,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluğu çerçevesinde kullanılacaktır"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4234,53 +4306,53 @@ msgstr "kullanıcı düzenle"
 msgid "from %s different users"
 msgstr " %s farklı kullanıcılardan"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "son güncelleme %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "bir dakikadan az"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "tekrarlanmış bildirim olarak işaretle"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "planlanan eylem olarak işaretle"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "bir iç yönlendirme olarak işaretle"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "kapandı olarak işaretle"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "Onarıldı olarak işaretle"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "Devam etmekte olarak işaretle"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "araştırılıyor olarak işaretle"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "Kurulun sorumluluğu dışında olarak işaretle"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "Planlandı olarak işaretle"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "onarılamaz olarak işaretle"
 
@@ -4326,8 +4398,8 @@ msgstr "özgün giriş: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "diğer bölgeler:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "yeniden açıldı"
 
@@ -4373,68 +4445,68 @@ msgstr "kullanıcı problemin sahibi"
 msgid "ward"
 msgstr "bölge"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> son bildirimler"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d gün"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d destekçiler"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
-#: 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] "<big>%s</big> bildirimlerin güncellemeleri"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok."
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d destekçiler"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d hafta"
 
+#: 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] "<big>%s</big> geçen ay onarıldı"
+
 #: 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"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> geçen ay onarıldı"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> son bildirimler"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d gün"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri"
 
 #: 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] "Bahsettiğiniz alanı kapsayan ilgili diğer kurullar hakkında henüz detaylı  bilgimiz <strong>yok</strong>"
+
+#: 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] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok."
diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1ef5207d9..64c7427ff 100644
--- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/uk_UA.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n"
@@ -18,7 +18,7 @@ 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:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "і"
@@ -110,7 +110,7 @@ msgstr "%s район, %s"
 msgid "%s, within %s ward"
 msgstr "%s, в межах %s району"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "(Defect &amp; location of defect)"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "(поштова скринька в чорному списку)"
@@ -142,12 +142,10 @@ msgstr "(відстань по-замовчуванню, що покриває 
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(закрито)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(полагоджено)"
@@ -156,7 +154,7 @@ msgstr "(полагоджено)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(графіті, сміття, крива бруківка, проблеми з вуличним освітленням тощо)"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "(не відправлено муніципалітету)"
 
@@ -164,21 +162,21 @@ msgstr "(не відправлено муніципалітету)"
 msgid "(optional)"
 msgstr "(вибірково)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "(відправлено обидвом)"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "-- Оберіть категорію --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "-- Оберіть тип майна --"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -197,8 +195,8 @@ msgstr ""
 "              This is probably why \"area covered\" is empty (below).<br>\n"
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Ні</strong> Я підтверджу поновлення е-п
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ні</strong> я залогінюсь через е-пошту"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>Так</strong> В мене є пароль"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -265,26 +263,29 @@ msgstr "Додати запис"
 msgid "Add new category"
 msgstr "Додати нову категорію"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "Додати користувача"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -292,7 +293,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "Додано %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -347,7 +348,7 @@ msgstr "Оновлення відмітило цю проблему як вир
 msgid "Anonymous"
 msgstr "Анонім"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "Анонім:"
@@ -402,7 +403,7 @@ msgstr "Назначити зовнішньому відділу:"
 msgid "Assign to subdivision:"
 msgstr "Назначити підрозділу:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -427,8 +428,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -436,7 +437,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Очікує перевірки модератором"
@@ -449,12 +450,12 @@ msgstr "Назад"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "Забанити адресу"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -485,10 +486,6 @@ msgstr ""
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "Не бачите мапу? <em>Пропустіть цей крок</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -501,7 +498,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -521,7 +519,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "В цій категорії проблеми не вирішуються > 4 тижнів"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -586,6 +584,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -614,10 +616,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -719,8 +722,8 @@ msgstr "Звернутись до команди"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "Не вдалось знайти користувача"
 
@@ -774,7 +777,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr ""
@@ -815,7 +818,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "Dealt with by subdivision within 5 working days"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
@@ -881,21 +884,35 @@ msgstr ""
 msgid "Don&rsquo;t know"
 msgstr "Не знаю"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "Не любите форми?"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Дубль"
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Дубль"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Дубль"
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -904,7 +921,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -923,11 +941,11 @@ msgstr "Редагувати"
 msgid "Edit body details"
 msgstr "Редагувати дані про орган"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -978,7 +996,7 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Е-пошта"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "Пошта занесена в чорний список"
 
@@ -996,11 +1014,11 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "Адреса вже в чорному списку"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1067,7 +1085,7 @@ msgid "Enter details of the problem"
 msgstr "Введіть подробиці проблеми"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1089,8 +1107,8 @@ msgstr "Зразок поштового коду %s"
 msgid "Examples:"
 msgstr "Приклади:"
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1126,7 +1144,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Додаткові дані:"
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1148,11 +1167,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "Полагодіть це вибравши <strong>зону покриття</strong> в <em>формі редагування органу </em> нижче."
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1160,12 +1180,12 @@ msgid "Fixed"
 msgstr "Вирішено"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "Вирішено - Рада"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "Вирішено - Користувач"
 
@@ -1183,7 +1203,7 @@ msgstr "Вирішено:"
 msgid "Flag as deleted"
 msgstr "Відмітьте як видалене"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "Відмітьте користувача"
 
@@ -1204,7 +1224,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "Відмічено:"
@@ -1242,7 +1262,7 @@ msgid "Frequently Asked Questions"
 msgstr "Часто задавані питання"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "Отримувати оновлення"
 
@@ -1268,7 +1288,7 @@ msgstr ""
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Вперед"
@@ -1277,7 +1297,7 @@ msgstr "Вперед"
 msgid "Going to send questionnaire?"
 msgstr "Збираєтесь відправити опитувальник?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1319,8 +1339,8 @@ msgstr "Вітаємо, %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1363,7 +1383,7 @@ msgstr ""
 msgid "I just updated a problem on @fixmystreet"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Нажаль ми не можем знайти вашу проблему в базі даних.\n"
 
@@ -1413,6 +1433,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1472,7 +1496,7 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1508,7 +1532,7 @@ msgid "Internal notes"
 msgstr "Внутрішні нотатки"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "Внутрішнє посилання"
 
@@ -1516,7 +1540,7 @@ msgstr "Внутрішнє посилання"
 msgid "Invalid agency_responsible value %s"
 msgstr "Невірне значення agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "Невірна кінцева дата"
 
@@ -1524,16 +1548,16 @@ msgstr "Невірна кінцева дата"
 msgid "Invalid format %s specified."
 msgstr "Невірний формат %s ."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "Невірна початкова дата"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1579,7 +1603,11 @@ msgstr "Останнє поновлення:"
 msgid "Last&nbsp;update:"
 msgstr "Останнє&nbsp;поновлення:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1624,6 +1652,10 @@ msgstr "Мапа"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr ""
@@ -1648,7 +1680,7 @@ msgstr ""
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "Повідомлення"
 
@@ -1668,7 +1700,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "Бракує jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1676,7 +1708,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1688,7 +1720,7 @@ msgstr "Модерується підрозділом на протязі роб
 msgid "Month"
 msgstr "Місяць"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1712,7 +1744,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ім'я"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1724,7 +1756,7 @@ msgstr "Ім'я:"
 msgid "Name: %s"
 msgstr "Ім'я: %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1826,7 +1858,7 @@ msgstr "Новий стан"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1841,7 +1873,7 @@ msgstr "Далі"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1862,7 +1894,7 @@ msgstr "Без органу"
 msgid "No council"
 msgstr "Без департаменту"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "Не вибраний департамент"
 
@@ -1922,7 +1954,7 @@ msgid ""
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2000,15 +2032,15 @@ msgstr "Раніше <br>виправлено"
 msgid "Older <br>problems"
 msgstr "Старіші <br>проблеми"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2054,13 +2086,13 @@ msgstr "Або проблеми прозвітовані до:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Або ви можете підписатись на алярми відносно вашого району чи департаменту:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2081,7 +2113,7 @@ msgid "Parent"
 msgstr "Предок"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "Частково"
 
@@ -2115,7 +2147,7 @@ msgid "Phone number (optional)"
 msgstr "Номер телефону (опціонально)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2167,7 +2199,7 @@ msgstr "Розмістіть шпильку на карті"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2195,14 +2227,14 @@ msgid "Please check your email address is correct"
 msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Будь ласка оберіть категорію"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "Будь ласка оберіть тип майна"
 
@@ -2223,13 +2255,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "Будь ласка не використовуйте образи&nbsp;&mdash; ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "Будь ласка введіть повідомлення"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2244,13 +2276,13 @@ msgid "Please enter a password"
 msgstr "Будь ласка введіть пароль"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Будь ласка вкажіть тему"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2263,7 +2295,7 @@ msgstr "Будь ласка введіть правильну адресу е-п
 msgid "Please enter a valid email address"
 msgstr "Будь ласка введіть правильну адресу е-пошти"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Будь ласка додайте трохи подробиць"
@@ -2296,8 +2328,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "Будь ласка введіть ім'я та прізвище - департаментам потрібні ці дані. Якщо не хочете їх показувати - не ставте галочку внизу."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2334,7 +2366,7 @@ msgstr "Будь ласка опишіть проблему детально"
 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 "Будь ласка заповніть форму нижче подробицями проблеми, і опишіть місцезнаходження якомога точніше в полі подробиць."
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Будь ласка вкажіть чи ви хочете отримати інші опитування."
 
@@ -2360,20 +2392,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "Будь ласка зауважте:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Будь ласка додайте трохи пояснень стосовно перевідкриття сповіщення"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "Будь ласка додайте текст і фото"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "Будь ласка розкажіть чи ви відправляли сповіщення департаменту раніше"
 
@@ -2389,7 +2421,7 @@ msgstr "Оберіть бажаний потік інформації"
 msgid "Please select the type of alert you want"
 msgstr "Будь ласка оберіть тип бажаних алярмів"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Будь ласка вкажіть чи була вирішена проблема"
 
@@ -2408,22 +2440,22 @@ msgstr "Будь ласка напишіть повідомлення"
 msgid "Please write your update here"
 msgstr "Будь ласка напишіть поновлення"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "Допис"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "Опубліковано анонімно в %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "Опубліковано %s (<strong>%s</strong>) в %s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Опубліковано %s в %s"
 
@@ -2439,7 +2471,8 @@ msgstr "Попередній"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2455,10 +2488,15 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "Приватний"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Приватний"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "Проблема"
@@ -2494,11 +2532,11 @@ msgstr "Стан проблеми змінено базуючись на рез
 msgid "Problems"
 msgstr "Проблеми"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "Проблеми поблизу"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "Проблеми на мапі"
 
@@ -2510,7 +2548,7 @@ msgstr "Нещодавно вирішені проблеми"
 msgid "Problems within %.1fkm of this location"
 msgstr "Проблеми в радіусі %.1fkm від цієї точки"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2534,6 +2572,7 @@ msgstr "Проблеми в межах:"
 msgid "Property address:"
 msgstr "Адреса майна:"
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "Надішліть оновлення"
@@ -2551,12 +2590,17 @@ msgstr "Вказання імені і паролю не обов'язкове,
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Публічна відповідь:"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Публічна відповідь:"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2580,7 +2624,7 @@ msgstr "Опитування %d проведено стосовно пробле
 msgid "Questionnaire %d sent for problem %d"
 msgstr "Анкета %d відправлена по проблемі %d"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "Анкета заповнена автором сповіщення"
 
@@ -2588,7 +2632,7 @@ msgstr "Анкета заповнена автором сповіщення"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS потік"
 
@@ -2616,7 +2660,7 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2632,12 +2676,12 @@ msgid "RSS feed of recent local problems"
 msgstr "RSS стрічка недавніх локальних проблем"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "RSS стрічка з оновленнями по цій проблемі"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "Отримувати листа коли інформація по проблемі буде оновлена"
 
@@ -2659,7 +2703,7 @@ msgstr "Нещодавно <br>вирішені"
 msgid "Recently reported problems"
 msgstr "Нещодавно перевідкриті проблеми"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2667,13 +2711,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "Зняти прапорець"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2681,7 +2727,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2695,7 +2741,8 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2705,6 +2752,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "Сповістити про проблему"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "Поскаржитись"
@@ -2728,8 +2776,8 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Сповіщено анонімно по %s"
 
@@ -2738,8 +2786,8 @@ msgstr "Сповіщено анонімно по %s"
 msgid "Reported before"
 msgstr "Сповіщено раніше"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Перевідкрито %s о %s"
 
@@ -2752,27 +2800,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сповіщено в категорії %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сповіщено в категорії %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сповіщено в категорію %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "Сповіщено %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "Сповіщено через %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сповіщено через %s в категорію %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сповіщено через %s в категорію %s %s о %s"
 
@@ -2882,16 +2930,16 @@ msgstr "Обслуговувач цієї дороги (отримано з до
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Повернули вліво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2902,21 +2950,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr ""
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "позначено як дублююче сповіщення"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Зберети зміни"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -2953,6 +3006,10 @@ msgstr "Пошук не знайшов користувачів."
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -2996,27 +3053,27 @@ msgstr "Надіслано:"
 msgid "Service:"
 msgstr "Сервіс:"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "Поширити"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3088,7 +3145,7 @@ msgstr ""
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Вибачте, сталася помилка"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3136,12 +3193,14 @@ msgstr "Початкова дата:"
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Стан"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3181,7 +3240,7 @@ msgstr "Підкатегорія: %s"
 msgid "Subdivision/Body"
 msgstr "Підрозділ/Орган"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "Тема"
 
@@ -3198,7 +3257,7 @@ msgstr "Тема:"
 msgid "Submit"
 msgstr "Підтвердити"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3224,7 +3283,7 @@ msgid "Submitted"
 msgstr "Підтверджено"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "Підписатись"
 
@@ -3501,7 +3560,7 @@ msgstr "Сталась проблема з відображенням сторі
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Сталась помилка при спробі показати сторінку. Будь ласка спробуйте пізніше."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3583,9 +3642,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "Ця інформація обов'язкова"
@@ -3610,6 +3669,10 @@ msgstr "Цю проблему вирішено"
 msgid "This problem has not been fixed"
 msgstr "Цю проблему не вирішено"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3684,7 +3747,8 @@ msgstr "До перегляду точного місцезнаходження
 msgid "Total"
 msgstr "Загалом"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3692,7 +3756,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3709,14 +3773,14 @@ msgid "Try emailing us directly:"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "Неможливо виправити"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3736,8 +3800,8 @@ msgstr "Невідомо"
 msgid "Unknown alert type"
 msgstr "Невідомий тип алярму"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "Невідома помилка"
@@ -3748,6 +3812,10 @@ msgstr "Невідома помилка"
 msgid "Unknown problem ID"
 msgstr "Невідомий ідентифікатор проблеми"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "Поновлення"
@@ -3801,7 +3869,7 @@ msgid "Updated"
 msgstr "Поновлено"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3816,7 +3884,7 @@ msgstr "Поновлено!"
 msgid "Updates"
 msgstr "Поновлення"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст."
 
@@ -3847,11 +3915,11 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "Користувацький прапорець видалено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "Користувач відмічений"
 
@@ -3860,7 +3928,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "Пошук користувачів знайшов співпадіння в іменах та поштових адресах"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -3950,6 +4018,10 @@ msgstr "Коли відредаговано"
 msgid "When sent"
 msgstr "Коли відправлено"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -3998,7 +4070,7 @@ msgstr "Рік"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4013,11 +4085,11 @@ msgstr "Так"
 msgid "Yes I have a password"
 msgstr "Так, в мене є пароль"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
-#: templates/web/base/contact/index.html:48
+#: 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 "You are reporting the following problem report for being abusive, containing personal information, or similar:"
 
@@ -4034,7 +4106,7 @@ msgstr "Ви можете <a href=\"%s%s\">переглянути проблем
 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."
 
-#: templates/web/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "Технічна підтримка доступна за адресою <a href='mailto:%s'>%s</a>"
 
@@ -4128,9 +4200,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4150,7 +4222,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "Ваша інформація буде використана згідно <a href=\"/privacy\">політики конфіденційності</a>"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4229,53 +4301,53 @@ msgstr "редагувати користувача"
 msgid "from %s different users"
 msgstr "від %s різних користувачів"
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "останнє поновлення %s"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "менше хвилини"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "позначено як дублююче сповіщення"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "позначено дію як заплановану"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "позначено як внутрішній напрямок"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "позначено закритим"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "позначено полагодженим"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "позначено в процесі"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "позначено у вивченні"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "позначено як не відповідальність ради"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "позначено запланованим"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "позначено як неможливо полагодити"
 
@@ -4321,8 +4393,8 @@ msgstr "в оригіналі вказано: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "інші зони:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "перевідкрито"
 
@@ -4368,15 +4440,15 @@ msgstr "користувач є власником проблеми"
 msgid "ward"
 msgstr "двір"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, 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> звітів недавно"
-msgstr[2] "<big>%s</big> звітів недавно"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d день"
+msgstr[1] "%d днів"
+msgstr[2] "%d днів"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4384,15 +4456,7 @@ msgstr[0] "%d година"
 msgstr[1] "%d годин"
 msgstr[2] "%d годин"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d прибічник"
-msgstr[1] "%d прибічників"
-msgstr[2] "%d прибічників"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4400,23 +4464,15 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилин"
 msgstr[2] "%d хвилин"
 
-#: 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] "<big>%s</big> оновлення на звіті"
-msgstr[1] "<big>%s</big> оновлень на звіті"
-msgstr[2] "<big>%s</big> оновлень на звіті"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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[2] ""
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d прибічник"
+msgstr[1] "%d прибічників"
+msgstr[2] "%d прибічників"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4424,6 +4480,14 @@ msgstr[0] "%d тиждень"
 msgstr[1] "%d тижднів"
 msgstr[2] "%d тижднів"
 
+#: 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] "<big>%s</big> полагоджено минувшого місяця"
+msgstr[1] "<big>%s</big> полагоджено минувшого місяця"
+msgstr[2] "<big>%s</big> полагоджено минувшого місяця"
+
 #: templates/web/base/front/stats.html:8
 #, perl-format
 msgid "<big>%s</big> report in past week"
@@ -4432,21 +4496,21 @@ msgstr[0] "<big>%s</big> звіт за минувший тиждень"
 msgstr[1] "<big>%s</big> звітів за минувший тиждень"
 msgstr[2] "<big>%s</big> звітів за минувший тиждень"
 
-#: templates/web/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> полагоджено минувшого місяця"
-msgstr[1] "<big>%s</big> полагоджено минувшого місяця"
-msgstr[2] "<big>%s</big> полагоджено минувшого місяця"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> звіт недавно"
+msgstr[1] "<big>%s</big> звітів недавно"
+msgstr[2] "<big>%s</big> звітів недавно"
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d день"
-msgstr[1] "%d днів"
-msgstr[2] "%d днів"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> оновлення на звіті"
+msgstr[1] "<big>%s</big> оновлень на звіті"
+msgstr[2] "<big>%s</big> оновлень на звіті"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4455,3 +4519,11 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: 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[2] ""
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index 6d7242b38..600c79006 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/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: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
 #: perllib/FixMyStreet/Script/Reports.pm:199
 msgid " and "
 msgstr "與"
@@ -121,7 +121,7 @@ msgstr "%s 里/區, %s "
 msgid "%s, within %s ward"
 msgstr "%s, 在%s 里/區"
 
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
 msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者"
 
@@ -129,7 +129,7 @@ msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap
 msgid "(Defect &amp; location of defect)"
 msgstr "(缺陷 &amp; 缺陷地點)"
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 #: templates/web/base/admin/users.html:32
 msgid "(Email in abuse table)"
 msgstr "電郵為濫發信件"
@@ -153,12 +153,10 @@ msgstr "預設距離約涵蓋20萬人口"
 msgid "(alternatively the RSS feed can be customised, within %s)"
 msgstr "或可在 %s另外修改自定RSS訂閱"
 
-#: templates/web/base/report/_item.html:27
 #: templates/web/zurich/report/_item.html:19
 msgid "(closed)"
 msgstr "(結束)"
 
-#: templates/web/base/report/_item.html:25
 #: templates/web/zurich/report/_item.html:17
 msgid "(fixed)"
 msgstr "(己處理)"
@@ -167,7 +165,7 @@ msgstr "(己處理)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )"
 
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:60
 msgid "(not sent to council)"
 msgstr "不要向地方政府送出"
 
@@ -175,21 +173,21 @@ msgstr "不要向地方政府送出"
 msgid "(optional)"
 msgstr "(任選)"
 
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
 msgid "(sent to both)"
 msgstr "兩個都送出"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 msgid "-- Pick a category --"
 msgstr "選擇分類"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "-- Pick a property type --"
 msgstr "選擇公物種類"
 
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
 msgid "--Choose a template--"
 msgstr ""
 
@@ -210,8 +208,8 @@ msgstr ""
 "\n"
 "可以在你的設定檔加入一些 <code>地圖連結別</code> "
 
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s"
@@ -234,11 +232,11 @@ msgstr "<strong>不</strong> 我要用電子郵件收到更新通知"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>不</strong> 我要用電子郵件登入"
 
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -249,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password"
 msgstr "<strong>是</strong> 我有密碼"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -282,26 +280,29 @@ msgstr "新增有關單位"
 msgid "Add new category"
 msgstr "新增種類"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
 msgid "Add to shortlist"
 msgstr ""
 
 #: templates/web/base/admin/user_edit.html:4
 #: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
 msgid "Add user"
 msgstr "新增使用者"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -309,7 +310,7 @@ msgstr ""
 msgid "Added %s"
 msgstr "新增 %s"
 
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
@@ -364,7 +365,7 @@ msgstr "本問題已解決之更新標註"
 msgid "Anonymous"
 msgstr "匿名"
 
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
 #: templates/web/base/admin/update_edit.html:23
 msgid "Anonymous:"
 msgstr "匿名:"
@@ -419,7 +420,7 @@ msgstr "分派給外部機："
 msgid "Assign to subdivision:"
 msgstr "交派給下級單位："
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
 msgid "Assign users to areas"
 msgstr ""
 
@@ -444,8 +445,8 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
 msgid "Available categories"
 msgstr ""
 
@@ -453,7 +454,7 @@ msgstr ""
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "待核可"
@@ -466,12 +467,12 @@ msgstr "回上層"
 msgid "Back to all reports"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
 msgid "Ban email address"
 msgstr "禁止之電子郵件"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -502,10 +503,6 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收
 msgid "Can't see the map? <em>Skip this step</em>"
 msgstr "無法顯示地圖？ <em>略過本步驟</em>"
 
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
 #: templates/web/base/admin/responsepriorities/list.html:8
 msgid "Categories"
@@ -518,7 +515,8 @@ msgstr ""
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -538,7 +536,7 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr "4週前己修復問題之類別"
 
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -611,6 +609,10 @@ 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:76
+msgid "Choose another"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -639,10 +641,11 @@ msgstr "選擇確認電子郵件上的連結以作登入"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
@@ -744,8 +747,8 @@ msgstr "連結本團隊"
 msgid "Coordinates:"
 msgstr "協同單位:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
 msgid "Could not find user"
 msgstr "找不到該戶用"
 
@@ -799,7 +802,7 @@ msgstr ""
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Create template"
 msgstr "創建模版"
@@ -840,7 +843,7 @@ msgid "Dealt with by subdivision within 5 working days"
 msgstr "下屬單位5個工作天內處理。"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr "刪除模版"
@@ -906,21 +909,35 @@ msgstr "您是否有 %s密碼？ "
 msgid "Don&rsquo;t know"
 msgstr "不知道"
 
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
 msgid "Don't like forms?"
 msgstr "不喜歡此表單？"
 
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:52
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/admin/report_blocks.html:16
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "複製 "
 
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "複製 "
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "複製 "
+
 #: templates/web/base/admin/body.html:116
 msgid ""
 "Each contact for the body has a category, which is displayed to the public. \n"
@@ -932,7 +949,8 @@ msgstr ""
 "不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n"
 "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。"
 
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -951,11 +969,11 @@ msgstr "編輯"
 msgid "Edit body details"
 msgstr "編輯有關單位細節"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Edit other users' permissions"
 msgstr ""
 
@@ -1006,7 +1024,7 @@ msgstr "編輯器"
 msgid "Email"
 msgstr "電子郵件"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
 msgid "Email added to abuse list"
 msgstr "電子郵件列入濫發名單"
 
@@ -1024,11 +1042,11 @@ msgstr "建立電郵通知"
 msgid "Email alert deleted"
 msgstr "取消電郵通知"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
 msgid "Email already in abuse list"
 msgstr "電子郵件己在濫發名單"
 
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
 #: templates/web/base/admin/update_edit.html:35
 #: templates/web/base/admin/user-form.html:19
 #: templates/web/zurich/admin/body.html:48
@@ -1100,7 +1118,7 @@ msgid "Enter details of the problem"
 msgstr "請在此填寫問題的細節"
 
 #: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
 #: templates/web/base/tokens/abuse.html:1
 #: templates/web/base/tokens/abuse.html:3
 #: templates/web/base/tokens/error.html:1
@@ -1122,8 +1140,8 @@ msgstr "郵遞區號範例 %s"
 msgid "Examples:"
 msgstr "範例："
 
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
 msgid "Existing category"
 msgstr ""
 
@@ -1159,7 +1177,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "其它資料："
 
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
 msgid "Extra details"
 msgstr ""
 
@@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
 msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:24
-#: templates/web/base/admin/report_blocks.html:9
+#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
@@ -1193,12 +1213,12 @@ msgid "Fixed"
 msgstr "已處理"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
 msgid "Fixed - Council"
 msgstr "已處理－地方政府"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
 msgid "Fixed - User"
 msgstr "已處理－用戶"
 
@@ -1216,7 +1236,7 @@ msgstr "已處理:"
 msgid "Flag as deleted"
 msgstr "標記警告為刪除　"
 
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Flag user"
 msgstr "標記警告用戶"
 
@@ -1237,7 +1257,7 @@ 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/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
 #: templates/web/base/admin/user-form.html:100
 msgid "Flagged:"
 msgstr "警告:"
@@ -1275,7 +1295,7 @@ msgid "Frequently Asked Questions"
 msgstr "常見問題回覆　"
 
 #: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
 msgid "Get updates"
 msgstr "取得更新"
 
@@ -1301,7 +1321,7 @@ msgstr "很高興聽到問題已處理了。"
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
 #: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "走"
@@ -1310,7 +1330,7 @@ msgstr "走"
 msgid "Going to send questionnaire?"
 msgstr "即將送出問卷？"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Grant access to the admin"
 msgstr ""
 
@@ -1352,8 +1372,8 @@ msgstr "您好 %s"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:906
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
@@ -1396,7 +1416,7 @@ msgstr "我剛才申報了一個問題 "
 msgid "I just updated a problem on @fixmystreet"
 msgstr "我利用@fixmystreet 申報了一個問題 "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr " 我們無法在資料庫中找到您的問題。\n"
 
@@ -1447,6 +1467,10 @@ msgstr ""
 msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
 msgstr ""
 
+#: templates/web/base/admin/template_edit.html:36
+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:70
 msgid ""
 "If you wish to leave a public update on the problem, please enter it here\n"
@@ -1519,7 +1543,7 @@ msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送:
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:192
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
 #: templates/web/base/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
@@ -1555,7 +1579,7 @@ msgid "Internal notes"
 msgstr "內部筆記"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
 msgid "Internal referral"
 msgstr "內部推薦"
 
@@ -1563,7 +1587,7 @@ msgstr "內部推薦"
 msgid "Invalid agency_responsible value %s"
 msgstr "無效的權責單位數值 %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
 msgid "Invalid end date"
 msgstr "無效的結束日期"
 
@@ -1571,16 +1595,16 @@ msgstr "無效的結束日期"
 msgid "Invalid format %s specified."
 msgstr "無效的%s 特定格式"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
 msgid "Invalid start date"
 msgstr "無效的開始日期"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
@@ -1626,7 +1650,11 @@ msgstr "上回更新:"
 msgid "Last&nbsp;update:"
 msgstr "上一次更新:"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
 msgid "Least recently updated"
 msgstr ""
 
@@ -1671,6 +1699,10 @@ msgstr "地圖"
 msgid "Manage shortlist"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
 msgstr "地圖"
@@ -1695,7 +1727,7 @@ msgstr "八週前曾經標記為已修復/結案"
 msgid "Markup problem details"
 msgstr ""
 
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
 msgid "Message"
 msgstr "留言"
 
@@ -1715,7 +1747,7 @@ msgstr ""
 msgid "Missing jurisdiction_id"
 msgstr "遺失 jurisdiction_id"
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate"
 msgstr ""
 
@@ -1723,7 +1755,7 @@ msgstr ""
 msgid "Moderate report details"
 msgstr ""
 
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
 msgid "Moderate this report"
 msgstr ""
 
@@ -1735,7 +1767,7 @@ msgstr "一個工作天內協調出部門"
 msgid "Month"
 msgstr "月份"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Most commented"
 msgstr ""
 
@@ -1759,7 +1791,7 @@ msgstr ""
 msgid "Name"
 msgstr "名字"
 
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
 #: templates/web/base/admin/responsepriorities/edit.html:13
 #: templates/web/base/admin/update_edit.html:34
 #: templates/web/base/admin/user-form.html:16
@@ -1771,7 +1803,7 @@ msgstr "名字："
 msgid "Name: %s"
 msgstr "名字： %s"
 
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1873,7 +1905,7 @@ msgstr "新陳述"
 msgid "New template"
 msgstr "新模版"
 
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
 msgid "Newest"
 msgstr ""
 
@@ -1888,7 +1920,7 @@ msgstr "下一步"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:26
 #: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1909,7 +1941,7 @@ msgstr "無有關單位"
 msgid "No council"
 msgstr "無地方政府"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
 msgid "No council selected"
 msgstr "未選擇地方政府"
 
@@ -1975,7 +2007,7 @@ msgstr ""
 "所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2053,15 +2085,15 @@ msgstr "己解決之舊問題　"
 msgid "Older <br>problems"
 msgstr "舊問題　"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
 msgid "Oldest"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/report/update/form_update.html:41
@@ -2107,13 +2139,13 @@ msgstr "或將此問題 申報給:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "您可以訂閱　里/區內的更新通知"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
 #: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
 #: perllib/FixMyStreet/Script/Reports.pm:185
 #: perllib/FixMyStreet/Script/Reports.pm:200
 msgid "Other"
@@ -2134,7 +2166,7 @@ msgid "Parent"
 msgstr "上級 "
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
 msgid "Partial"
 msgstr "部份"
 
@@ -2168,7 +2200,7 @@ msgid "Phone number (optional)"
 msgstr "電話號碼(非必填)"
 
 #: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
 #: templates/web/base/admin/user-form.html:21
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
@@ -2220,7 +2252,7 @@ msgstr "在地圖上作標記"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:940
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
 #: templates/web/base/dashboard/index.html:140
 #: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
@@ -2248,14 +2280,14 @@ msgid "Please check your email address is correct"
 msgstr "請確認您電郵地址無誤"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "請選擇類別"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
 msgid "Please choose a property type"
 msgstr "選擇公物種類"
 
@@ -2279,13 +2311,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
 msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見　"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
 #: templates/web/base/js/translation_strings.html:2
 msgid "Please enter a message"
 msgstr "請寫下您的留言"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
 msgid "Please enter a name"
 msgstr ""
 
@@ -2300,13 +2332,13 @@ msgid "Please enter a password"
 msgstr "請輸入密碼"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "請填下主旨"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2319,7 +2351,7 @@ msgstr "請輸入有效電子郵件"
 msgid "Please enter a valid email address"
 msgstr "請輸入有效的電子郵件"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "請填寫進一步細節"
@@ -2352,8 +2384,8 @@ msgid "Please enter your full name, councils need this information – if you do
 msgstr "請輸入您的全名，地方政府需要此資料 – 如果您不希望名字公開在網站上，請在下面方格中劃掉勾選。"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
-#: perllib/FixMyStreet/DB/Result/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2390,7 +2422,7 @@ msgstr "請在此填寫問題的細節"
 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 "請利用下方表單填寫問題細節，在細節項請儘量述明準確的位置。　"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "請選擇您是否願意收到其它問卷"
 
@@ -2416,20 +2448,20 @@ msgstr ""
 msgid "Please note:"
 msgstr "請加註記"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
 msgid "Please provide a public update for this report."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "如果您是再次申報，請說明原因"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
 msgid "Please provide some text as well as a photo"
 msgstr "請提供一些文字敍述與照片"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
 msgid "Please say whether you've ever reported a problem to your council before"
 msgstr "請敍明您是否曾向地方政府申報過問題？　"
 
@@ -2445,7 +2477,7 @@ msgstr "請選擇訂閱方式"
 msgid "Please select the type of alert you want"
 msgstr "請選擇更新通知方式"
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
 msgid "Please state whether or not the problem has been fixed"
 msgstr "請敍明該問題是否已解決"
 
@@ -2464,22 +2496,22 @@ msgstr "諘寫下您的留言"
 msgid "Please write your update here"
 msgstr "請寫下您的更新"
 
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
 #: templates/web/base/report/update-form.html:25
 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14
 #: templates/web/base/report/update/form_user_loggedout_password.html:10
 msgid "Post"
 msgstr "張貼"
 
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
 msgid "Posted anonymously at %s"
 msgstr "匿名張貼  %s"
 
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
 msgid "Posted by %s (<strong>%s</strong>) at %s"
 msgstr "由%s (<strong>%s</strong>) 在%s"
 
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "由 %s 在 %s 張貼"
 
@@ -2495,7 +2527,8 @@ msgstr "之前"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
 msgid "Priority"
 msgstr ""
 
@@ -2511,10 +2544,15 @@ msgstr "隱私與cookies"
 
 #: templates/web/base/admin/body.html:91
 #: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
 msgid "Private"
 msgstr "私人"
 
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "私人"
+
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
 msgstr "問題"
@@ -2550,11 +2588,11 @@ msgstr "依調查結果呈現的問題改善"
 msgid "Problems"
 msgstr "問題"
 
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
 msgid "Problems nearby"
 msgstr "鄰近的問題"
 
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
 msgid "Problems on the map"
 msgstr "地圖上的問題"
 
@@ -2566,7 +2604,7 @@ msgstr "FixMyStreet　最近回報的已修復問題　"
 msgid "Problems within %.1fkm of this location"
 msgstr "該地點　%.1f公里內的問題　"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
 #: perllib/FixMyStreet/Cobrand/UK.pm:208
 msgid "Problems within %s"
@@ -2590,6 +2628,7 @@ msgstr "在   範圍內的問題"
 msgid "Property address:"
 msgstr "公物地址："
 
+#: templates/web/base/report/duplicate-no-updates.html:2
 #: templates/web/base/report/update-form.html:6
 msgid "Provide an update"
 msgstr "提供更新資訊"
@@ -2607,12 +2646,17 @@ msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問
 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_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "公眾反應"
+
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "公眾反應"
 
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
 msgid "Public update:"
 msgstr ""
 
@@ -2636,7 +2680,7 @@ msgstr " %d回覆之問題%d, %s 到 %s 問卷 "
 msgid "Questionnaire %d sent for problem %d"
 msgstr "關於 %d問題所送出之 %d問卷 "
 
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
 msgid "Questionnaire filled in by problem reporter"
 msgstr "由問題申報者所填之問卷"
 
@@ -2644,7 +2688,7 @@ msgstr "由問題申報者所填之問卷"
 #: templates/web/base/alert/updates.html:9
 #: templates/web/base/around/display_location.html:1
 #: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed"
 msgstr "RSS訂閱"
 
@@ -2672,7 +2716,7 @@ msgstr "%s, 在%s 里/區"
 msgid "RSS feed of nearby problems"
 msgstr " RSS訂閱 %s區域問題"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
 #: perllib/FixMyStreet/Cobrand/UK.pm:215
 msgid "RSS feed of problems within %s"
@@ -2688,12 +2732,12 @@ msgid "RSS feed of recent local problems"
 msgstr "最近當地問題的RSS訂閱"
 
 #: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
 msgid "RSS feed of updates to this problem"
 msgstr "最近當地問題更新的RSS訂閱"
 
 #: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
 msgid "Receive email when updates are left on this problem."
 msgstr "透過電子郵件收取該問題之更新消息"
 
@@ -2715,7 +2759,7 @@ msgstr "最新 <br>解決"
 msgid "Recently reported problems"
 msgstr "近期申報之問題　"
 
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
 msgid "Recently updated"
 msgstr ""
 
@@ -2723,13 +2767,15 @@ 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/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
 msgid "Remove flag"
 msgstr "移除標記"
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
 msgid "Remove from shortlist"
 msgstr ""
 
@@ -2737,7 +2783,7 @@ msgstr ""
 msgid "Remove from site"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
 #: templates/web/base/admin/update_edit.html:69
 #: templates/web/zurich/admin/update_edit.html:35
 msgid "Remove photo (can't be undone!)"
@@ -2751,7 +2797,8 @@ msgstr "給用戶的回應"
 msgid "Report"
 msgstr "提報　"
 
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
 msgid "Report ID:"
 msgstr ""
 
@@ -2761,6 +2808,7 @@ msgstr ""
 msgid "Report a problem"
 msgstr "申報問題"
 
+#: templates/web/base/report/display_tools.html:10
 #: templates/web/base/report/display_tools.html:9
 msgid "Report abuse"
 msgstr "申報濫用"
@@ -2784,8 +2832,8 @@ msgstr "申報你的問題"
 msgid "Report, view, or discuss local problems"
 msgstr "申報，檢視，或討論在地問題"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "在%s 匿名申報 "
 
@@ -2794,8 +2842,8 @@ msgstr "在%s 匿名申報 "
 msgid "Reported before"
 msgstr "之前的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "由%s 的 %s 申報"
 
@@ -2808,27 +2856,27 @@ msgstr "由　　申報"
 msgid "Reported in the %s category"
 msgstr "%s 種類之申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s 種類下的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
 msgid "Reported in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
 msgid "Reported via %s anonymously at %s"
 msgstr "在%s 匿名申報 "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
 msgid "Reported via %s by %s at %s"
 msgstr "%s　透過 %s　在　%s類別的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "透過 %s　在　%s類別的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
@@ -2938,16 +2986,16 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "左轉　"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
@@ -2958,21 +3006,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
 msgid "Satellite"
 msgstr "衛星"
 
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "標註為重覆之申報"
+
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "儲存變動"
 
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
 msgid "Save with a public update"
 msgstr ""
 
@@ -3009,6 +3062,10 @@ msgstr "查無此用戶"
 msgid "See our privacy policy"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
 msgid "Select a body"
@@ -3052,27 +3109,27 @@ msgstr "送出"
 msgid "Service:"
 msgstr "服務"
 
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
 msgid "Set to my current location"
 msgstr ""
 
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
 msgid "Share"
 msgstr "分享"
 
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
 msgid "Shortlisted"
 msgstr ""
 
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
 msgid "Shortlisted by %s"
 msgstr ""
 
@@ -3147,7 +3204,7 @@ msgstr "抱歉這個wasn&rsquo;t 為有效的網址連結"
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "抱歉無法確認你的問題"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
 #: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3195,12 +3252,14 @@ msgstr "問始日："
 #: templates/web/base/admin/index.html:58
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "陳述"
 
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
 #: templates/web/base/admin/update_edit.html:28
 #: templates/web/zurich/admin/report_edit-sdm.html:75
 #: templates/web/zurich/admin/report_edit.html:103
@@ -3240,7 +3299,7 @@ msgstr "子類別：%s"
 msgid "Subdivision/Body"
 msgstr "下屬單位/機關"
 
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
 msgid "Subject"
 msgstr "主旨"
 
@@ -3257,7 +3316,7 @@ msgstr "主旨:"
 msgid "Submit"
 msgstr "送出"
 
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
 #: templates/web/base/admin/user-form.html:177
@@ -3283,7 +3342,7 @@ msgid "Submitted"
 msgstr "已送出"
 
 #: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
 msgid "Subscribe"
 msgstr "訂閱"
 
@@ -3566,7 +3625,7 @@ msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。"
 msgid "There was a problem showing this page. Please try again later."
 msgstr "本頁出現錯誤，請再試一次"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3658,9 +3717,9 @@ 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:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
 #: perllib/FixMyStreet/Cobrand/UK.pm:44
 msgid "This information is required"
 msgstr "本項資訊必填"
@@ -3685,6 +3744,10 @@ msgstr "問題己處理完畢"
 msgid "This problem has not been fixed"
 msgstr "問題尚未解決"
 
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
 #: templates/web/zurich/report/_main.html:14
@@ -3759,7 +3822,8 @@ msgstr "檢視地圖上問題之確切位置"
 msgid "Total"
 msgstr "總數"
 
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3767,7 +3831,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3784,14 +3848,14 @@ msgid "Try emailing us directly:"
 msgstr "何不直接發信給我們:"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Unable to fix"
 msgstr "無法修復"
 
 #: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
 #: templates/web/zurich/admin/report_edit-sdm.html:66
 #: templates/web/zurich/admin/report_edit.html:94
@@ -3811,8 +3875,8 @@ msgstr "未知的"
 msgid "Unknown alert type"
 msgstr "未知的通知類別"
 
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
 #: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
 #: templates/web/base/js/translation_strings.html:38
 msgid "Unknown error"
 msgstr "未知的錯誤"
@@ -3823,6 +3887,10 @@ msgstr "未知的錯誤"
 msgid "Unknown problem ID"
 msgstr "未知的問題編號　　"
 
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
 msgstr "更新"
@@ -3876,7 +3944,7 @@ msgid "Updated"
 msgstr "已更新"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376
 #: perllib/FixMyStreet/App/Controller/Admin.pm:824
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3891,7 +3959,7 @@ msgstr "已更新！"
 msgid "Updates"
 msgstr "更新"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
 msgid "Updates are limited to %s characters in length. Please shorten your update"
 msgstr "更新內容有　%s 字數限制，請簡化您的更新。"
 
@@ -3922,11 +3990,11 @@ msgstr "已用過之地圖"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
 msgid "User flag removed"
 msgstr "移除用戶的標記警告"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
 msgid "User flagged"
 msgstr "給用戶標記警告"
 
@@ -3935,7 +4003,7 @@ msgid "User search finds matches in users' names and email addresses."
 msgstr "用戶找到相符的名稱與電子郵件"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
@@ -4025,6 +4093,10 @@ msgstr "何時編輯　"
 msgid "When sent"
 msgstr "何時送出"
 
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:51
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
@@ -4073,7 +4145,7 @@ msgstr "年份"
 #: templates/web/base/admin/list_updates.html:34
 #: templates/web/base/admin/list_updates.html:35
 #: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
 #: templates/web/base/admin/report_edit.html:95
 #: templates/web/base/admin/update_edit.html:25
 #: templates/web/base/admin/users.html:32
@@ -4088,11 +4160,11 @@ msgstr "是"
 msgid "Yes I have a password"
 msgstr "我有密碼"
 
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "你申訴此問題遭不必要之和諧　"
 
-#: templates/web/base/contact/index.html:48
+#: 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 "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題　"
 
@@ -4109,7 +4181,7 @@ msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>."
 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/contact/index.html:113
+#: templates/web/base/contact/index.html:111
 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
 msgstr "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。"
 
@@ -4206,9 +4278,9 @@ msgstr ""
 #: templates/web/base/alert/_list.html:90
 #: templates/web/base/alert/updates.html:19
 #: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
 #: templates/web/base/report/new/form_user_loggedout_email.html:1
 #: templates/web/base/report/update/form_user_loggedout_email.html:1
 #: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4228,7 +4300,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
 msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用"
 
 #: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17
 #: templates/web/base/report/update/form_name.html:29
 #: templates/web/zurich/auth/general.html:61
@@ -4307,53 +4379,53 @@ msgstr "用戶編輯"
 msgid "from %s different users"
 msgstr "從不同的用戶%s  "
 
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "%s上回更新:"
 
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
 msgid "less than a minute"
 msgstr "少於一分鐘"
 
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as a duplicate report"
 msgstr "標註為重覆之申報"
 
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "標註為排程行動"
 
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "marked as an internal referral"
 msgstr "標註為內部推薦"
 
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as closed"
 msgstr "標註為關閉"
 
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as fixed"
 msgstr "標註為解決"
 
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as in progress"
 msgstr "標註為處理中"
 
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
 msgid "marked as investigating"
 msgstr "標註為調查中"
 
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "標註為非本區政府職責範圍"
 
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as planned"
 msgstr "標註為己規畫"
 
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as unable to fix"
 msgstr "標註為無法解決"
 
@@ -4399,8 +4471,8 @@ msgstr "原始輸入者"
 msgid "other areas:"
 msgstr "其它地區:"
 
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
 msgid "reopened"
 msgstr "重啟申報"
 
@@ -4446,68 +4518,68 @@ msgstr "%d 天數"
 msgid "ward"
 msgstr "路檔"
 
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
 #, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "近期的申報 <big>%s</big> "
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 日期"
 
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時數"
 
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d 支援者"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘數"
 
-#: 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] "<big>%s</big> 更新申報"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
 #, 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] "我們尚未有該區域負責單位之細節　"
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d 支援者"
 
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週數"
 
+#: 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] "上個月解決的<big>%s</big> "
+
 #: 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/base/front/stats.html:19
+#: templates/web/base/front/stats.html:13
 #, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "上個月解決的<big>%s</big> "
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "近期的申報 <big>%s</big> "
 
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
 #, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d 日期"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> 更新申報"
 
 #: 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] "我們<strong>尚未<strong>有該區域其它單位之細節　"
+
+#: 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] "我們尚未有該區域負責單位之細節　"
-- 
cgit v1.2.3


From 72d2d286c9b72a2c9b98c63deb2cef64a75508ea Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Feb 2017 12:46:29 +0000
Subject: Update changed strings, maintaining translations.

---
 locale/FixMyStreet.po                         | 38 ++++++++++++----------
 locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 44 +++++++++++++------------
 locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 44 +++++++++++++------------
 locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 44 +++++++++++++------------
 locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po | 44 +++++++++++++------------
 locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po | 47 +++++++++++++++------------
 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 44 +++++++++++++------------
 locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po | 46 ++++++++++++++------------
 locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po    | 46 ++++++++++++++------------
 29 files changed, 717 insertions(+), 600 deletions(-)

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index b7ad92f5a..60c0e8fb7 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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+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"
@@ -177,8 +177,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1584,6 +1584,10 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125 templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
 msgstr ""
@@ -1999,12 +2003,16 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3106,10 +3114,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:21 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18
 msgid "Unconfirmed"
 msgstr ""
@@ -3513,6 +3517,10 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6 templates/web/base/reports/body.html:7
 msgid "council"
 msgstr ""
@@ -3541,10 +3549,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -3569,6 +3573,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -3577,10 +3585,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122 templates/web/base/admin/questionnaire.html:15 templates/web/base/admin/questionnaire.html:16
 msgid "n/a"
 msgstr ""
diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
index 34b63e670..9825fd7ae 100644
--- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ar.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n"
@@ -207,8 +207,8 @@ msgstr ""
 "              هذا هو السبب المرجح وراء كون \"منطقة التغطية\" فارغة (أدناه).<br>\n"
 "              هل تريد إضافة بعض <code>MAPIT_TYPES</code> إلى ملف التكوين؟"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">إظهار</label> %s <label for=\"filter_categories\">عن</label> %s"
@@ -1952,6 +1952,13 @@ msgstr "لم يتم العثور على مشكلات مشار إليها."
 msgid "No flagged users found."
 msgstr "لم يتم العثور على مستخدمين مشار إليهم."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "يتعذر الإصلاح"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2502,14 +2509,18 @@ msgstr "نشر"
 msgid "Posted anonymously at %s"
 msgstr "نشر بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "تم النشر بواسطة %s (<strong>%s</strong>) في %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "تم النشر بواسطة %s في %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "تم النشر بواسطة <strong>%s</strong> (%s) في %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "تم النشر بواسطة <strong>%s</strong> في %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">نظام FixMyStreet الأساسي</a>"
@@ -3841,13 +3852,6 @@ msgstr "أعد المحاولة"
 msgid "Try emailing us directly:"
 msgstr "جرّب إرسال البريد الإلكتروني إلينا مباشرةً:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "يتعذر الإصلاح"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4349,6 +4353,10 @@ msgstr "الكل"
 msgid "by %s"
 msgstr "بواسطة %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "عليه علامة تقرير مكرر"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4382,10 +4390,6 @@ msgstr "آخر تحديث %s"
 msgid "less than a minute"
 msgstr "أقل من دقيقة واحدة"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "عليه علامة تقرير مكرر"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "عليه علامة إجراء مجدول"
@@ -4411,6 +4415,10 @@ msgstr "عليه علامة قيد التقدم"
 msgid "marked as investigating"
 msgstr "عليه علامة جارٍ التحقق"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "عليه علامة يتعذر الإصلاح"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "عليه علامة ليست مسؤولية المجلس"
@@ -4419,10 +4427,6 @@ msgstr "عليه علامة ليست مسؤولية المجلس"
 msgid "marked as planned"
 msgstr "عليه علامة مخطط"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "عليه علامة يتعذر الإصلاح"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
index f40e25084..de86cfcfd 100644
--- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/bg_BG.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1917,6 +1917,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2458,14 +2465,18 @@ msgstr "Публикувай"
 msgid "Posted anonymously at %s"
 msgstr "Публикувано от анонимен потребител в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Публикувано от %s (<strong>%s</strong>) в %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Публикувано от %s в %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Публикувано от <strong>%s</strong> (%s) в %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Публикувано от <strong>%s</strong> в %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3775,13 +3786,6 @@ msgstr "Опитайте отново"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4280,6 +4284,10 @@ msgstr ""
 msgid "by %s"
 msgstr "от %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "маркиран като \"повторен\""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4313,10 +4321,6 @@ msgstr "Последно обновено  %s"
 msgid "less than a minute"
 msgstr "преди по-малко от минута"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "маркиран като \"повторен\""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "маркиран като \"започнато е действие\""
@@ -4342,6 +4346,10 @@ msgstr "маркиран като \"в процес на обработка\""
 msgid "marked as investigating"
 msgstr "маркиран като \"проучва се\""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "марикарн като \"непоправим\""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "маркиран като \"незадължение на Общината\""
@@ -4350,10 +4358,6 @@ msgstr "маркиран като \"незадължение на Общинат
 msgid "marked as planned"
 msgstr "маркиран като \"планиран\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "марикарн като \"непоправим\""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
index 87e9d1b0e..f4943dc0c 100644
--- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "              To je pravděpodobně proč je   \"area covered\" prázdná (níže).<br>\n"
 "             Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru."
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1926,6 +1926,13 @@ msgstr "Nebyla nalazena žádná sledovaná hlášení."
 msgid "No flagged users found."
 msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Nelze opravit"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2473,14 +2480,18 @@ msgstr "Odeslat"
 msgid "Posted anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Odesláno uživatelem %s (<strong>%s</strong>) v %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Odesláno uživatelem  %s v %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+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:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Odesláno uživatelem <strong>%s</strong> v %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3806,13 +3817,6 @@ msgstr "Opakujte znovu"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Nelze opravit"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4313,6 +4317,10 @@ msgstr ""
 msgid "by %s"
 msgstr "uživatelem  %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "označené jako duplicitní hlášení"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4346,10 +4354,6 @@ msgstr "naposledy upravené %s"
 msgid "less than a minute"
 msgstr "méně než minutou"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "označené jako duplicitní hlášení"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "označené jako plánované"
@@ -4375,6 +4379,10 @@ msgstr "označené jako probíhající"
 msgid "marked as investigating"
 msgstr "označené jako zkoumání"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "označené za nemožné spravit"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "označené za nespadající do kompetencí úřadu"
@@ -4383,10 +4391,6 @@ msgstr "označené za nespadající do kompetencí úřadu"
 msgid "marked as planned"
 msgstr "označené za naplánované"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "označené za nemožné spravit"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
index 54e1dbbf6..91efc9979 100644
--- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cy.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Methu trwsio"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,14 +2447,18 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr "Postiwyd yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Postiwyd gan %s (<strong>%s</strong>) am %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postiwyd gan %s am %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Postiwyd gan <strong>%s</strong> am %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3754,13 +3765,6 @@ msgstr "Ceisio eto"
 msgid "Try emailing us directly:"
 msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Methu trwsio"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4256,6 +4260,10 @@ msgstr ""
 msgid "by %s"
 msgstr "gan %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4289,10 +4297,6 @@ msgstr "diweddarwyd ddiwethaf %s"
 msgid "less than a minute"
 msgstr "llai na munud"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4318,6 +4322,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4326,10 +4334,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
index ae8bc539e..fc7b7763f 100644
--- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/da_DK.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1926,6 +1926,13 @@ msgstr "Fandt ingen markerede problemer."
 msgid "No flagged users found."
 msgstr "Fant ingen markerede brugere."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Kan ikke fikses"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2476,14 +2483,18 @@ msgstr "Indsend"
 msgid "Posted anonymously at %s"
 msgstr "Publiceret anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Sendt ind af %s (<strong>%s</strong>) %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt ind af %s %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Sendt ind af <strong>%s</strong> (%s) %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Sendt ind af <strong>%s</strong> %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3819,13 +3830,6 @@ msgstr "Prøv igen"
 msgid "Try emailing us directly:"
 msgstr "Forsøg at sende epost direkte til os:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Kan ikke fikses"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4325,6 +4329,10 @@ msgstr ""
 msgid "by %s"
 msgstr "af %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "markeret som duplikeret rapport"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4358,10 +4366,6 @@ msgstr "sidst opdateret %s"
 msgid "less than a minute"
 msgstr "mindre end et minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "markeret som duplikeret rapport"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markeret som planlagt"
@@ -4387,6 +4391,10 @@ msgstr "markeret som under udførelse"
 msgid "marked as investigating"
 msgstr "markeret som undersøges"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "markeret som uløseligt"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markeret som ikke myndighedens ansvar"
@@ -4395,10 +4403,6 @@ msgstr "markeret som ikke myndighedens ansvar"
 msgid "marked as planned"
 msgstr "markeret som planlagt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "markeret som uløseligt"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2c74eaf63..f04acee65 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Zeige</label> %s <label for=\"filter_categories\">&uuml;ber</label> %s"
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,12 +2447,16 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3754,13 +3765,6 @@ msgstr "Erneut versuchen"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4256,6 +4260,10 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4289,10 +4297,6 @@ msgstr "letzte Bearbeitung %s"
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4318,6 +4322,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4326,10 +4334,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index a76a894c3..82e9342bc 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2016\n"
 "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Kann nicht behoben werden"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,12 +2447,16 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3753,13 +3764,6 @@ msgstr "Erneut versuchen"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Kann nicht behoben werden"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4255,6 +4259,10 @@ msgstr ""
 msgid "by %s"
 msgstr "von %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4288,10 +4296,6 @@ msgstr "zuletzt aktualisiert %s"
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "als Aktion geplant markiert"
@@ -4317,6 +4321,10 @@ msgstr "als in Bearbeitung markiert"
 msgid "marked as investigating"
 msgstr "als untersuchend markiert"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4325,10 +4333,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr "als geplant markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0e97e216c..4e46a9b9e 100644
--- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/el_GR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n"
@@ -209,8 +209,8 @@ msgstr ""
 "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).<br>\n"
 "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Προβολή</label> %s <label for=\"filter_categories\">σχετικά με</label> %s"
@@ -1943,6 +1943,13 @@ msgstr "Δε βρέθηκαν επισημασμένα προβλήματα."
 msgid "No flagged users found."
 msgstr "Δε βρέθηκαν επισημασμένοι χρήστες."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Δεν είναι εφικτή η διόρθωση"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2490,14 +2497,18 @@ msgstr "Δημοσίευση"
 msgid "Posted anonymously at %s"
 msgstr "Δημοσιεύθηκε ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Δημοσιεύθηκε από %s (<strong>%s</strong>) στις %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Δημοσιεύθηκε από %s στις %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Δημοσιεύθηκε από <strong>%s</strong> (%s) στις %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Δημοσιεύθηκε από <strong>%s</strong> στις %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Βασισμένο στην <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Πλατφόρμα FixMyStreet</a>"
@@ -3821,13 +3832,6 @@ msgstr "Δοκίμασε ξανά"
 msgid "Try emailing us directly:"
 msgstr "Στείλε μας ένα email:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Δεν είναι εφικτή η διόρθωση"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4329,6 +4333,10 @@ msgstr ""
 msgid "by %s"
 msgstr "από %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "σημειωμένη ως διπλή αναφορά"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4362,10 +4370,6 @@ msgstr "τελευταία ενημέρωση %s"
 msgid "less than a minute"
 msgstr "λιγότερο από ένα λεπτό"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "σημειωμένη ως διπλή αναφορά"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "σημειωμένη ως προγραμματισμένη δράση"
@@ -4391,6 +4395,10 @@ msgstr "σημειωμένο ως σε διαδικασία αντιμετώπι
 msgid "marked as investigating"
 msgstr "σημειωμένο ως υπό έλεγχο"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "σημειωμένο ως αδύνατο να διορθωθεί"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας"
@@ -4399,10 +4407,6 @@ msgstr "σημειωμένο ως εκτός αρμοδιότητας της υ
 msgid "marked as planned"
 msgstr "σημειωμένο ως προγραμματισμένο"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "σημειωμένο ως αδύνατο να διορθωθεί"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index 76d91112d..cc9d6ca26 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/mysociety/teams/12067/es_ES/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1942,6 +1942,13 @@ msgstr "No se encuentran problemas marcados."
 msgid "No flagged users found."
 msgstr "No se encuentran usuarios marcados"
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Incapaz de arreglarlo"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2489,14 +2496,18 @@ msgstr "Publicar"
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Publicado por %s (<strong>%s</strong>) - %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Publicado por <strong>%s</strong> (%s) - %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Publicado por <strong>%s</strong> - %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3825,13 +3836,6 @@ msgstr "Inténtelo de nuevo"
 msgid "Try emailing us directly:"
 msgstr "Pruebe enviándonos un correo directamente:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Incapaz de arreglarlo"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4333,6 +4337,10 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "marcado como un informe duplicado"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4366,10 +4374,6 @@ msgstr "ultima actualización %s"
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "marcado como un informe duplicado"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
@@ -4395,6 +4399,10 @@ msgstr "marcado como en progreso"
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "marcado como que no se puede arreglar"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
@@ -4403,10 +4411,6 @@ msgstr "marcado como que el ayuntamiento no es responsable"
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "marcado como que no se puede arreglar"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
index d01c119e7..96112f369 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robert Lo Bue <rob@applingua.com>, 2017\n"
 "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n"
@@ -204,8 +204,8 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
@@ -1953,6 +1953,13 @@ msgstr "No se encuentran problemas marcados."
 msgid "No flagged users found."
 msgstr "No se encuentran usuarios marcados"
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Incapaz de arreglarlo"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2502,14 +2509,18 @@ msgstr "Publicar"
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Publicado por %s (<strong>%s</strong>) - %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Publicado por <strong>%s</strong> (%s) - %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Publicado por <strong>%s</strong> - %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Con la tecnología de <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
@@ -3839,13 +3850,6 @@ msgstr "Inténtelo de nuevo"
 msgid "Try emailing us directly:"
 msgstr "Pruebe enviándonos un correo directamente:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Incapaz de arreglarlo"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4347,6 +4351,10 @@ msgstr "todo"
 msgid "by %s"
 msgstr "por %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "marcado como un informe duplicado"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4380,10 +4388,6 @@ msgstr "ultima actualización %s"
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "marcado como un informe duplicado"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
@@ -4409,6 +4413,10 @@ msgstr "marcado como en progreso"
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "marcado como que no se puede arreglar"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
@@ -4417,10 +4425,6 @@ msgstr "marcado como que el ayuntamiento no es responsable"
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "marcado como que no se puede arreglar"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 01ae973e4..4c28d86d9 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>, 2016\n"
 "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n"
@@ -205,8 +205,8 @@ msgstr ""
 "             Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).<br>\n"
 "              Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Afficher</label> %s <label for=\"filter_categories\">à propos de</label> %s"
@@ -1949,6 +1949,13 @@ msgstr "Aucun problème coché trouvé."
 msgid "No flagged users found."
 msgstr "Aucun utilisateur coché trouvé."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Ne peut être résolu"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2501,14 +2508,18 @@ msgstr "Envoyer"
 msgid "Posted anonymously at %s"
 msgstr "Signalé anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Envoyé par %s (<strong>%s</strong>) à %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Signalé par %s à %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Envoyé par <strong>%s</strong> (%s) à %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Envoyé par <strong>%s</strong> à %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
@@ -3839,13 +3850,6 @@ msgstr "Essayez à nouveau"
 msgid "Try emailing us directly:"
 msgstr "Essayez en nous envoyant un e-mail directement:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Ne peut être résolu"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4344,6 +4348,10 @@ msgstr "Tous"
 msgid "by %s"
 msgstr "par %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "rapport marqué comme dupliqué"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4377,10 +4385,6 @@ msgstr "dernière mise à jour %s"
 msgid "less than a minute"
 msgstr "moins d'une minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "rapport marqué comme dupliqué"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "action marquée comme établie"
@@ -4406,6 +4410,10 @@ msgstr "marqué comme en cours"
 msgid "marked as investigating"
 msgstr "marqué comme en cours d'investigation"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "marqué comme impossible à résoudre"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marqué comme n'étant pas de la responsabilité de la commune"
@@ -4414,10 +4422,6 @@ msgstr "marqué comme n'étant pas de la responsabilité de la commune"
 msgid "marked as planned"
 msgstr "marqué comme planifié"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "marqué comme impossible à résoudre"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
index efd539cfe..bfdb98370 100644
--- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/he_IL.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,12 +2447,16 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3753,13 +3764,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4255,6 +4259,10 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4288,10 +4296,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4317,6 +4321,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4325,10 +4333,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index f76fc8c5d..e39b5efba 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,14 +2447,18 @@ msgstr "Objavi"
 msgid "Posted anonymously at %s"
 msgstr "Objavljeno anonimno na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Objavio %s (<strong>%s</strong>) na %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Objavio %s na %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Objavio <strong>%s</strong> (%s) na %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Objavio <strong>%s</strong> na %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3753,13 +3764,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4255,6 +4259,10 @@ msgstr ""
 msgid "by %s"
 msgstr "od %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4288,10 +4296,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr "manje od minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4317,6 +4321,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4325,10 +4333,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
index d9c57a9be..f76a9dc13 100644
--- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/it.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,14 +2447,18 @@ msgstr "Posta"
 msgid "Posted anonymously at %s"
 msgstr "Postato anonimamente al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Postato da %s  (<strong>%s</strong>) al %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postato da %s al %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Postato da <strong>%s</strong> (%s) al %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Postato da <strong>%s</strong> al %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3754,13 +3765,6 @@ msgstr "Prova ancora"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4256,6 +4260,10 @@ msgstr ""
 msgid "by %s"
 msgstr "da %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4289,10 +4297,6 @@ msgstr "ultimo aggiornamento %s"
 msgid "less than a minute"
 msgstr "meno di un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4318,6 +4322,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4326,10 +4334,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
index 872be63b9..4ae0de14a 100644
--- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/lt_LT.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paulius Zaleckas <paulius.zaleckas@gmail.com>, 2017\n"
 "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).<br>\n"
 "Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1942,6 +1942,13 @@ msgstr "Pažymėtos problemos nerastos"
 msgid "No flagged users found."
 msgstr "Pažymėti vartotojai nerasti."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2489,12 +2496,16 @@ msgstr "Įkelti"
 msgid "Posted anonymously at %s"
 msgstr "Pateikta anonimiškai %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3803,13 +3814,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4305,6 +4309,10 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4338,10 +4346,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4367,6 +4371,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4375,10 +4383,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index 00d05d918..f21f3ad03 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
 "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1902,6 +1902,13 @@ msgstr "Belum ada masalah yang ditanda."
 msgid "No flagged users found."
 msgstr "Belum ada pengguna yang ditanda."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Tidak dapat diselesai"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2445,14 +2452,18 @@ msgstr "Post"
 msgid "Posted anonymously at %s"
 msgstr "Post tanpa nama pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Dipostkan oleh %s (<strong>%s</strong>) pada %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Dipostkan oleh %s pada %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Dipostkan oleh <strong>%s</strong> (%s) pada %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Dipostkan oleh <strong>%s</strong> pada %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3760,13 +3771,6 @@ msgstr "Cuba lagi"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Tidak dapat diselesai"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4265,6 +4269,10 @@ msgstr ""
 msgid "by %s"
 msgstr "dari %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "ditanda sebagai laporan salinan"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4298,10 +4306,6 @@ msgstr "kemaskini yang lepas %s"
 msgid "less than a minute"
 msgstr "kurang dari seminit"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "ditanda sebagai laporan salinan"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "ditanda sebagai tindakan dijadualkan"
@@ -4327,6 +4331,10 @@ msgstr "ditanda sebagai dijalani"
 msgid "marked as investigating"
 msgstr "ditanda sebagai disiasati"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "ditanda sebagai tak boleh dibaiki"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "ditanda sebagai bukan tanggungjawab majlis"
@@ -4335,10 +4343,6 @@ msgstr "ditanda sebagai bukan tanggungjawab majlis"
 msgid "marked as planned"
 msgstr "ditanda sebagai dijadual"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "ditanda sebagai tak boleh dibaiki"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
index 428e50600..69f9ceff3 100644
--- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1899,6 +1899,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,14 +2447,19 @@ msgstr "တင္မည္"
 msgid "Posted anonymously at %s"
 msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "%s မွာ %s မွတင္ခဲ့သည္"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#, fuzzy
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3754,13 +3766,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4263,6 +4268,10 @@ msgstr ""
 msgid "by %s"
 msgstr "%s မွ"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4296,10 +4305,6 @@ msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံ
 msgid "less than a minute"
 msgstr "တစ္မိနစ္ခန္႔သာ"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "ျပဳျပင္ထားေသာ အခ်ိန္ဇယားကို အမွတ္အသားျပဳလုပ္ပါ"
@@ -4325,6 +4330,10 @@ msgstr "ဆက္လက္လုပ္ေဆာင္ေနဆဲ အမွတ
 msgid "marked as investigating"
 msgstr "စံုစမ္းစစ္ေဆးေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
@@ -4333,10 +4342,6 @@ msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင
 msgid "marked as planned"
 msgstr "စီစဥ္ထားၿပီးျဖစ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4360c6a6a..f5d109f2f 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: pere <pere-transifex@hungry.com>, 2016\n"
 "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n"
@@ -196,8 +196,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Vis</label> %s <label for=\"filter_categories\">om</label> %s"
@@ -1930,6 +1930,13 @@ msgstr "Fant ingen flaggede problemer."
 msgid "No flagged users found."
 msgstr "Fant ingen flaggede brukere."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Kan ikke fikses"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2483,14 +2490,18 @@ msgstr "Send inn"
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Lagt inn av %s (<strong>%s</strong>) %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Lagt inn av <strong>%s</strong> %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
@@ -3827,13 +3838,6 @@ msgstr "Prøv igjen"
 msgid "Try emailing us directly:"
 msgstr "Forsøk å sende epost direkte til oss:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Kan ikke fikses"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4333,6 +4337,10 @@ msgstr "alle"
 msgid "by %s"
 msgstr "av %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "markert som duplisert rapport"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4366,10 +4374,6 @@ msgstr "sist oppdatert %s"
 msgid "less than a minute"
 msgstr "mindre enn et minutt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "markert som duplisert rapport"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markert som planlagt"
@@ -4395,6 +4399,10 @@ msgstr "markert som under arbeid"
 msgid "marked as investigating"
 msgstr "markert som undersøkes"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "markert som uløselig"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markert som ikke administrasjonens ansvar"
@@ -4403,10 +4411,6 @@ msgstr "markert som ikke administrasjonens ansvar"
 msgid "marked as planned"
 msgstr "markert som planlagt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "markert som uløselig"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1e4d3746d..a7b89ee99 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jos Helmich <jos@valaquanta.fi>, 2016\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).<br>\n"
 "Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1910,6 +1910,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2451,14 +2458,18 @@ msgstr "Bericht"
 msgid "Posted anonymously at %s"
 msgstr "Anoniem geplaatst bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Geplaatst door %s (<strong>%s</strong>) bij %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Geplaatst door %s bij %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Geplaatst door <strong>%s</strong> (%s) bij %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Geplaatst door <strong>%s</strong> bij %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3764,13 +3775,6 @@ msgstr "Opnieuw proberen"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4266,6 +4270,10 @@ msgstr ""
 msgid "by %s"
 msgstr "door %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4299,10 +4307,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr "minder dan een minuut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4328,6 +4332,10 @@ msgstr "gemarkeerd als in behandeling"
 msgid "marked as investigating"
 msgstr "gemarkeerd als in onderzoek"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4336,10 +4344,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr "gemarkeerd als gepland"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 77f0cec84..a33ea6c42 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1897,6 +1897,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2440,14 +2447,18 @@ msgstr "Send inn"
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Lagt inn av %s (<strong>%s</strong>) %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Lagt inn av <strong>%s</strong> %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3756,13 +3767,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4258,6 +4262,10 @@ msgstr ""
 msgid "by %s"
 msgstr "av %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4291,10 +4299,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr "mindre enn eitt minutt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4320,6 +4324,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4328,10 +4336,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
index da6c17968..f1ccc9a6e 100644
--- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
@@ -1902,6 +1902,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Incapaz de ser resolvido"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2446,14 +2453,18 @@ msgstr "Postar"
 msgid "Posted anonymously at %s"
 msgstr "Postado anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Postado por %s (<strong>%s</strong>) em %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postado por %s aem %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Postado por <strong>%s</strong> (%s) em %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Postado por <strong>%s</strong> em %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3760,13 +3771,6 @@ msgstr "Tente novamente"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Incapaz de ser resolvido"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4262,6 +4266,10 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr ""
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4295,10 +4303,6 @@ msgstr "Última atualizada %s"
 msgid "less than a minute"
 msgstr "menos de um minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr ""
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr ""
@@ -4324,6 +4328,10 @@ msgstr ""
 msgid "marked as investigating"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4332,10 +4340,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr ""
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 28e1433b4..751e462d9 100644
--- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n"
@@ -192,8 +192,8 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1897,6 +1897,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr ""
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2438,12 +2445,16 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+msgid "Posted by %s at %s"
+msgstr ""
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
-msgid "Posted by %s at %s"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
 #: templates/web/base/front/footer-marketing.html:12
@@ -3751,13 +3762,6 @@ msgstr ""
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr ""
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4253,6 +4257,10 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "marcat ca raport duplicat"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4286,10 +4294,6 @@ msgstr ""
 msgid "less than a minute"
 msgstr "mai puţin de un minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "marcat ca raport duplicat"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "marcat ca acţiune planificată"
@@ -4315,6 +4319,10 @@ msgstr "marcat ca fiind în curs de desfăşurare"
 msgid "marked as investigating"
 msgstr "marcat ca fiind în curs de cercetare"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "marcat ca imposibil de rezolvat"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "marcat ca nefiind responsabilitatea consiliului"
@@ -4323,10 +4331,6 @@ msgstr "marcat ca nefiind responsabilitatea consiliului"
 msgid "marked as planned"
 msgstr "marcat ca planificat"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "marcat ca imposibil de rezolvat"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
index 41174b382..2abdae88f 100644
--- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ru.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n"
@@ -207,8 +207,8 @@ msgstr ""
 "Возможно, поэтому поле «зона покрытия» не заполнено (см. ниже).<br>\n"
 "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Показать отчеты:</label> %s <label for=\"filter_categories\">в категории:</label> %s"
@@ -1957,6 +1957,13 @@ msgstr "Не найдено помеченных неполадок."
 msgid "No flagged users found."
 msgstr "Не найдено помеченных пользователей."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Невозможно устранить"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2507,14 +2514,18 @@ msgstr "Опубликовать"
 msgid "Posted anonymously at %s"
 msgstr "Опубликовано анонимно (%s)"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Автор публикации: %s (<strong>%s</strong>), время публикации: %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Автор публикации: %s, время публикации: %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "На базе платформы <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet</a>"
@@ -3846,13 +3857,6 @@ msgstr "Повторите попытку"
 msgid "Try emailing us directly:"
 msgstr "Напишите нам:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Невозможно устранить"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4354,6 +4358,10 @@ msgstr ""
 msgid "by %s"
 msgstr "автор: %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "помечено как копия обращения"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4387,10 +4395,6 @@ msgstr "последнее обновление: %s"
 msgid "less than a minute"
 msgstr "менее минуты"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "помечено как копия обращения"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "помечено как запланированное действие"
@@ -4416,6 +4420,10 @@ msgstr "помечено как находящееся в процессе ра
 msgid "marked as investigating"
 msgstr "помечено как находящееся в процессе расследования"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "помечено как проблема, которую невозможно устранить"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "помечено как вопрос вне ответственности органа управления"
@@ -4424,10 +4432,6 @@ msgstr "помечено как вопрос вне ответственност
 msgid "marked as planned"
 msgstr "помечено как запланированное"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "помечено как проблема, которую невозможно устранить"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
index d27cbeff6..c9fd444be 100644
--- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sq.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Granit Zhubi <granitzhubi@gmail.com>, 2016\n"
 "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n"
@@ -203,8 +203,8 @@ msgstr ""
 "              Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).<br>\n"
 "              Ndoshta shtoni disa <code>MAPIT_TYPES</code> ne skedarin tuaj te konfigurimit?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1935,6 +1935,13 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "E pamundur të zgjidhet"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2476,14 +2483,18 @@ msgstr "Posto"
 msgid "Posted anonymously at %s"
 msgstr "Postuar ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Postuar nga  %s (<strong>%s</strong>) ne %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postuar nga %s ne %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Postuar nga  <strong>%s</strong> (%s) ne %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Postuar nga  <strong>%s</strong> ne %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3807,13 +3818,6 @@ msgstr "Provo përsëri"
 msgid "Try emailing us directly:"
 msgstr "Provoni për të na shkruar email direkt:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "E pamundur të zgjidhet"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4309,6 +4313,10 @@ msgstr "Të gjitha"
 msgid "by %s"
 msgstr "nga %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "shenuar si raport i dyfishuar"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4342,10 +4350,6 @@ msgstr "Perditesimi i fundit %s"
 msgid "less than a minute"
 msgstr "më pak se një minutë"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "shenuar si raport i dyfishuar"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "shenuar si veprim i planifikuar"
@@ -4371,6 +4375,10 @@ msgstr "shenuar si ne progres"
 msgid "marked as investigating"
 msgstr "shenuar si i shqyrtuar"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "Etiketuar si e pamundur për ta rregulluar"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr ""
@@ -4379,10 +4387,6 @@ msgstr ""
 msgid "marked as planned"
 msgstr "shenuar si i planifikuar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "Etiketuar si e pamundur për ta rregulluar"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index bf25313be..66098021b 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jon Kristensen <info@jonkri.com>, 2016\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "              Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.<br>\n"
 "              Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Visa</label> %s <label for=\"filter_categories\">om</label> %s"
@@ -1909,6 +1909,13 @@ msgstr "Inga flaggade problem kunde hittas."
 msgid "No flagged users found."
 msgstr "Inga flaggade användare kunde hittas."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Kunde inte åtgärda"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2452,14 +2459,18 @@ msgstr "Skicka"
 msgid "Posted anonymously at %s"
 msgstr "Postat anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Postat av %s (<strong>%s</strong>) %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Postat av %s %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Postat av <strong>%s</strong> (%s) %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Postat av <strong>%s</strong> %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Byggd på <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet-plattformen</a>"
@@ -3770,13 +3781,6 @@ msgstr "Försök igen"
 msgid "Try emailing us directly:"
 msgstr "Prova att skicka ett e-brev till oss direkt:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Kunde inte åtgärda"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4272,6 +4276,10 @@ msgstr "samtliga"
 msgid "by %s"
 msgstr "av %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "markerad som dubblett av rapport"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4305,10 +4313,6 @@ msgstr "senast uppdaterad %s"
 msgid "less than a minute"
 msgstr "mindre än en minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "markerad som dubblett av rapport"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "markerad som åtgärd schemalagd"
@@ -4334,6 +4338,10 @@ msgstr "markerad som pågående"
 msgid "marked as investigating"
 msgstr "markerad som under utredning"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "markerad som kunde inte åtgärda"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "markerad som ej kommunens ansvar"
@@ -4342,10 +4350,6 @@ msgstr "markerad som ej kommunens ansvar"
 msgid "marked as planned"
 msgstr "markerad som planerad"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "markerad som kunde inte åtgärda"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
index e73754901..4c2db53c8 100644
--- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/tr_TR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "Bu muhtemelen \"kapalı alanın\" neden boş olduğunu(aşağıda)<br>\n"
 "Belkide yapılandırma dosyanıza bazı <code>MAPIT_TYPES</code> eklemelisiniz?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1922,6 +1922,13 @@ msgstr "İşaretlenen problemler bulunamadı."
 msgid "No flagged users found."
 msgstr "İşaretlenen kullanıcılar bulunamadı."
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Onarımı mümkün değil"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2463,14 +2470,18 @@ msgstr "Paylaş"
 msgid "Posted anonymously at %s"
 msgstr "%s Anonim olarak gönderildi"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "%s (<strong>%s</strong>) tarafından %s 'te paylaşılmıştır"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Tarafından paylaşıldı %s saat %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+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:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "<strong>%s</strong> tarafından %s 'te paylaşılmıştır"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3778,13 +3789,6 @@ msgstr "Tekrar dene"
 msgid "Try emailing us directly:"
 msgstr "Direkt olarak e-posta gönderin:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Onarımı mümkün değil"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4282,6 +4286,10 @@ msgstr ""
 msgid "by %s"
 msgstr "%s tarafından"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "tekrarlanmış bildirim olarak işaretle"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4315,10 +4323,6 @@ msgstr "son güncelleme %s"
 msgid "less than a minute"
 msgstr "bir dakikadan az"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "tekrarlanmış bildirim olarak işaretle"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "planlanan eylem olarak işaretle"
@@ -4344,6 +4348,10 @@ msgstr "Devam etmekte olarak işaretle"
 msgid "marked as investigating"
 msgstr "araştırılıyor olarak işaretle"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "onarılamaz olarak işaretle"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "Kurulun sorumluluğu dışında olarak işaretle"
@@ -4352,10 +4360,6 @@ msgstr "Kurulun sorumluluğu dışında olarak işaretle"
 msgid "marked as planned"
 msgstr "Planlandı olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "onarılamaz olarak işaretle"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
index 64c7427ff..ce9dfee93 100644
--- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/uk_UA.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n"
@@ -195,8 +195,8 @@ msgstr ""
 "              This is probably why \"area covered\" is empty (below).<br>\n"
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
@@ -1910,6 +1910,13 @@ msgstr "Не знайдено маркованих проблем"
 msgid "No flagged users found."
 msgstr "Не знайдено маркованих користувачів"
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "Неможливо виправити"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2451,14 +2458,18 @@ msgstr "Допис"
 msgid "Posted anonymously at %s"
 msgstr "Опубліковано анонімно в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "Опубліковано %s (<strong>%s</strong>) в %s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "Опубліковано %s в %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "Опубліковано <strong>%s</strong> (%s) в %s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "Опубліковано <strong>%s</strong> в %s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr ""
@@ -3772,13 +3783,6 @@ msgstr "Спробуйте ще раз"
 msgid "Try emailing us directly:"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "Неможливо виправити"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4277,6 +4281,10 @@ msgstr ""
 msgid "by %s"
 msgstr "від %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "позначено як дублююче сповіщення"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4310,10 +4318,6 @@ msgstr "останнє поновлення %s"
 msgid "less than a minute"
 msgstr "менше хвилини"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "позначено як дублююче сповіщення"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "позначено дію як заплановану"
@@ -4339,6 +4343,10 @@ msgstr "позначено в процесі"
 msgid "marked as investigating"
 msgstr "позначено у вивченні"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "позначено як неможливо полагодити"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "позначено як не відповідальність ради"
@@ -4347,10 +4355,6 @@ msgstr "позначено як не відповідальність ради"
 msgid "marked as planned"
 msgstr "позначено запланованим"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "позначено як неможливо полагодити"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index 600c79006..62cd873c0 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/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: 2017-02-02 10:22+0000\n"
+"POT-Creation-Date: 2017-02-02 10:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -208,8 +208,8 @@ msgstr ""
 "\n"
 "可以在你的設定檔加入一些 <code>地圖連結別</code> "
 
-#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
+#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
 #: templates/web/base/reports/_list-filters.html:28
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s"
@@ -1957,6 +1957,13 @@ msgstr "未發現標記警告問題 "
 msgid "No flagged users found."
 msgstr "未發現標記警告用戶"
 
+#: templates/web/base/admin/report_blocks.html:1
+#: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/update/form_update.html:44
+msgid "No further action"
+msgstr "無法修復"
+
 #: templates/web/zurich/admin/report_edit-sdm.html:125
 #: templates/web/zurich/admin/report_edit.html:259
 msgid "No further updates"
@@ -2507,14 +2514,18 @@ msgstr "張貼"
 msgid "Posted anonymously at %s"
 msgstr "匿名張貼  %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
-msgid "Posted by %s (<strong>%s</strong>) at %s"
-msgstr "由%s (<strong>%s</strong>) 在%s"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:255
 msgid "Posted by %s at %s"
 msgstr "由 %s 在 %s 張貼"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+msgid "Posted by <strong>%s</strong> (%s) at %s"
+msgstr "由<strong>%s</strong> (%s) 在%s"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+msgid "Posted by <strong>%s</strong> at %s"
+msgstr "由<strong>%s</strong> 在%s"
+
 #: templates/web/base/front/footer-marketing.html:12
 msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
 msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
@@ -3847,13 +3858,6 @@ msgstr "再試一次"
 msgid "Try emailing us directly:"
 msgstr "何不直接發信給我們:"
 
-#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update/form_update.html:41
-#: templates/web/base/report/update/form_update.html:44
-msgid "Unable to fix"
-msgstr "無法修復"
-
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:21
 #: templates/web/base/admin/update_edit.html:30
@@ -4355,6 +4359,10 @@ msgstr ""
 msgid "by %s"
 msgstr "由 %s"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+msgid "closed as a duplicate report"
+msgstr "標註為重覆之申報"
+
 #: templates/web/base/reports/body.html:6
 #: templates/web/base/reports/body.html:7
 msgid "council"
@@ -4388,10 +4396,6 @@ msgstr "%s上回更新:"
 msgid "less than a minute"
 msgstr "少於一分鐘"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
-msgid "marked as a duplicate report"
-msgstr "標註為重覆之申報"
-
 #: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as action scheduled"
 msgstr "標註為排程行動"
@@ -4417,6 +4421,10 @@ msgstr "標註為處理中"
 msgid "marked as investigating"
 msgstr "標註為調查中"
 
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+msgid "marked as no further action"
+msgstr "標註為無法解決"
+
 #: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as not the council's responsibility"
 msgstr "標註為非本區政府職責範圍"
@@ -4425,10 +4433,6 @@ msgstr "標註為非本區政府職責範圍"
 msgid "marked as planned"
 msgstr "標註為己規畫"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
-msgid "marked as unable to fix"
-msgstr "標註為無法解決"
-
 #: perllib/FixMyStreet/App/Controller/Admin.pm:122
 #: templates/web/base/admin/questionnaire.html:15
 #: templates/web/base/admin/questionnaire.html:16
-- 
cgit v1.2.3


From 05581029fa4e416c9dd0715c4f1575e5029f4616 Mon Sep 17 00:00:00 2001
From: Altin Ukshini <altin.ukshini@gmail.com>
Date: Thu, 2 Feb 2017 14:54:32 +0100
Subject: Call base_url_with_lang in base_url_for_report.

This function is used e.g. in report lists, and if you were using the
multiple language subdomain functionality, those links could take you
to a different language.
---
 perllib/FixMyStreet/Cobrand/Default.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index aad91429a..56e365050 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -209,14 +209,14 @@ sub base_url { FixMyStreet->config('BASE_URL') }
 =head2 base_url_for_report
 
 Return the base url for a report (might be different in a two-tier county, but
-most of the time will be same as base_url). Report may be an object, or a
-hashref.
+most of the time will be same as base_url_with_lang). Report may be an object,
+or a hashref.
 
 =cut
 
 sub base_url_for_report {
     my ( $self, $report ) = @_;
-    return $self->base_url;
+    return $self->base_url_with_lang;
 }
 
 =head2 base_host
-- 
cgit v1.2.3


From 1fab7bb790f1e4fed0fe49e8fac9e2612d1ebeed Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 Feb 2017 13:33:15 +0000
Subject: Add a 'closest_address' hidden Open311 attribute.

This joins easting, northing and an external ID field.
---
 perllib/FixMyStreet/DB/Result/Contact.pm  | 2 +-
 perllib/FixMyStreet/SendReport/Open311.pm | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index 0c9a7c0d8..f7e8ac5b5 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -86,7 +86,7 @@ __PACKAGE__->many_to_many( response_priorities => 'contact_response_priorities',
 sub get_metadata_for_input {
     my $self = shift;
     my $id_field = $self->id_field;
-    my @metadata = grep { $_->{code} !~ /^(easting|northing|$id_field)$/ } @{$self->get_extra_fields};
+    my @metadata = grep { $_->{code} !~ /^(easting|northing|closest_address|$id_field)$/ } @{$self->get_extra_fields};
 
     # Just in case the extra data is in an old parsed format
     foreach (@metadata) {
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index ee40f371a..9c55683ed 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -81,6 +81,8 @@ sub send {
         foreach (@{$contact->get_extra_fields}) {
             if ($_->{code} eq $id_field) {
                 push @$extra, { name => $id_field, value => $row->id };
+            } elsif ($_->{code} eq 'closest_address' && $h->{closest_address}) {
+                push @$extra, { name => $_->{code}, value => $h->{$_->{code}} };
             } elsif ($_->{code} =~ /^(easting|northing)$/) {
                 if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
                     push @$extra, { name => $_->{code}, value => $h->{$_->{code}} };
-- 
cgit v1.2.3


From afb90c54e9bfbabf9adc5fe0c66db38b0f406781 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Feb 2017 08:50:54 +0000
Subject: Version 2.0.2.

---
 .travis.yml                  |  1 +
 README.md                    | 39 ++++++++++++++++++++++++++++++++++++++-
 bin/site-specific-install.sh |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37460292c..17701566e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ notifications:
       - "irc.mysociety.org#fixmystreet"
     use_notice: true
     skip_join: true
+  slack: mysociety:1M2CXeMwHIf8SrGoKyZrz0jO
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/863c1892a6a51e5a3b3c
diff --git a/README.md b/README.md
index 95a8f03dd..33eec1832 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 1.6.1.
+Platform is now at version 2.0.2.
 
 ## Installation
 
@@ -45,6 +45,43 @@ web-based cross-browser testing tools for this project.
 
 ## Releases
 
+* v2.0.2 (3rd February 2017)
+    - Front end changes:
+        - Add an offline fallback page with appcache. #1588
+        - Improve print layout for report list pages. #1548
+        - Rename ‘unable to fix’ as ‘no further action’.
+    - Bugfixes:
+        - Mark two missing strings for translation. #1604
+        - Make sure email is lowercase when signing in. #1623
+        - Make sure language included in calls to base_url_for_report. #1617
+        - Small CSS homepage fixes.
+        - Admin:
+            - Fix filtering on shortlist page. #1620
+            - Fix 'save with public update' toggle. #1615
+    - Admin improvements:
+        - Add offline report inspection for inspectors. #1588 #1602 #1608
+        - Admin with appropriate permission can see body user who left
+          contribute_as_body report or update. #1601 #1603
+        - Include ‘Add user’ link on admin user search results page. #1606
+        - Redirect to new user after user creation/edit. #1606
+        - Redirect to shortlist after inspection if user has permission. #1612
+        - Allow response templates to be associated with a state, and default
+          to that template if report state changed to match. #1587
+        - Disable show name checkbox when reporting as someone else. #1597
+        - Show response priorities in report list items. #1582
+        - Shortlist add/remove icons in report lists and report page. #1582
+        - Reordering shortlist buttons in report lists. #1582
+        - Default inspect form to save with public update.
+        - Drop unneeded Cancel button on inspect form.
+        - Use ‘*’ on admin page to signify superuser.
+    - Development improvements:
+        - Update has_body_permission_to to allow superusers. #1600
+        - Move staging flags to their own config variable. #1600
+        - Only warn of Open311 failure after a couple, in case it's transient.
+        - Only load user body permissions once per request.
+        - Return 400/500 for some client/server errors.
+        - Fix bad cross-year test.
+
 * v2.0.1 (16th December 2016)
     - Bugfixes:
         - Fix issue in dragging map in Chrome 55. openlayers/ol2#1510
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 007cd1839..07581ccb8 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:-v2.0.1}
+VERSION=${VERSION_OVERRIDE:-v2.0.2}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
 
-- 
cgit v1.2.3


From 2899488e979eadad94e72108cfa31f3d13364a3d Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 3 Feb 2017 14:53:14 +0000
Subject: [Greenwich] Reduce on-map age further to 21 days

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

diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 62b0e1fc8..7d6058145 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -58,7 +58,7 @@ sub contact_email {
 sub reports_per_page { return 20; }
 
 sub on_map_default_max_pin_age {
-    return '3 month';
+    return '21 days';
 }
 
 1;
-- 
cgit v1.2.3


From 514c4da6c45af09e08c8528c479eca039c3997ab Mon Sep 17 00:00:00 2001
From: rbg-joe <rbg-joe@users.noreply.github.com>
Date: Mon, 6 Feb 2017 15:25:53 +0000
Subject: [Greenwich] Add a badge to official status updates

Adding an official badge to Greenwich updates so as to avoid exchanges in which
public contributions are mistaken for official ones.

As per the Bromley version e.g. https://fix.bromley.gov.uk/report/973784 - this
helps to avoid situations where public contributions are mistaken for official
ones.
---
 perllib/FixMyStreet/DB/Result/Comment.pm |   2 ++
 web/cobrands/greenwich/favicon.png       | Bin 0 -> 1298 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 web/cobrands/greenwich/favicon.png

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index a15400cc1..26ba89fda 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -245,6 +245,8 @@ sub meta_line {
         my $body = $self->user->body;
         if ($body eq 'Bromley Council') {
             $body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>";
+        } elsif ($body eq 'Royal Borough of Greenwich') {
+            $body = "$body <img src='/cobrands/greenwich/favicon.png' alt=''>";
         }
         if ($c->user_exists and $c->user->has_permission_to('view_body_contribute_details', $self->problem->bodies_str_ids)) {
             $meta = sprintf( _( 'Posted by <strong>%s</strong> (%s) at %s' ), $body, $user_name, Utils::prettify_dt( $self->confirmed ) );
diff --git a/web/cobrands/greenwich/favicon.png b/web/cobrands/greenwich/favicon.png
new file mode 100644
index 000000000..c107d24ef
Binary files /dev/null and b/web/cobrands/greenwich/favicon.png differ
-- 
cgit v1.2.3


From 263ba94fe4ba91ef08cfada386900669ff289a2b Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 6 Feb 2017 17:11:58 +0000
Subject: Ignore some more fixmystreet-international symlinks

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index bae1f1576..40fa98c8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ UG_FixMyCommunity.pm
 gh_fixmycommunity
 *[Aa]rregla[Mm]i[Bb]arrio*
 *[Ff]ix[Mm]indelo*
+*[Dd]ans[Mm]on[Qq]wat*
-- 
cgit v1.2.3


From 81b642a59ec389399131880f4850148157787c38 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Thu, 2 Feb 2017 15:25:27 +0000
Subject: Add shortlist filters

---
 perllib/FixMyStreet/App/Controller/Reports.pm | 39 +++++++++++++++++---
 t/app/controller/reports.t                    | 51 ++++++++++++++++++++++++++-
 templates/web/base/reports/_list-filters.html |  4 +++
 3 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 2635b7b7a..69a2ddb0f 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -378,6 +378,25 @@ sub load_and_group_problems : Private {
         non_public => 0,
         state      => [ keys %$states ]
     };
+    my $filter = {
+        order_by => $c->stash->{sort_order},
+        rows => $c->cobrand->reports_per_page,
+    };
+
+    if (defined $c->stash->{filter_status}{shortlisted}) {
+        $where->{'me.id'} = { '=', \"user_planned_reports.report_id"};
+        $where->{'user_planned_reports.removed'} = undef;
+        $filter->{join} = 'user_planned_reports';
+    } elsif (defined $c->stash->{filter_status}{unshortlisted}) {
+        my $shortlisted_ids = $c->cobrand->problems->search({
+            'me.id' => { '=', \"user_planned_reports.report_id"},
+            'user_planned_reports.removed' => undef,
+        }, {
+           join => 'user_planned_reports',
+           columns => ['me.id'],
+        })->as_query;
+        $where->{'me.id'} = { -not_in => $shortlisted_ids };
+    }
 
     my $not_open = [ FixMyStreet::DB::Result::Problem::fixed_states(), FixMyStreet::DB::Result::Problem::closed_states() ];
     if ( $type eq 'new' ) {
@@ -413,11 +432,9 @@ sub load_and_group_problems : Private {
 
     $problems = $problems->search(
         $where,
-        {
-            order_by => $c->stash->{sort_order},
-            rows => $c->cobrand->reports_per_page,
-        }
+        $filter
     )->include_comment_counts->page( $page );
+
     $c->stash->{pager} = $problems->pager;
 
     my ( %problems, @pins );
@@ -500,6 +517,19 @@ sub stash_report_filter_status : Private {
         %filter_problem_states = %$s;
     }
 
+    if ($status{shortlisted}) {
+        $filter_status{shortlisted} = 1;
+    }
+
+    if ($status{unshortlisted}) {
+        $filter_status{unshortlisted} = 1;
+    }
+
+    if (keys %filter_problem_states == 0) {
+      my $s = FixMyStreet::DB::Result::Problem->open_states();
+      %filter_problem_states = (%filter_problem_states, %$s);
+    }
+
     $c->stash->{filter_problem_states} = \%filter_problem_states;
     $c->stash->{filter_status} = \%filter_status;
     return 1;
@@ -577,4 +607,3 @@ Licensed under the Affero GPL.
 __PACKAGE__->meta->make_immutable;
 
 1;
-
diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t
index 141269cd8..8fa03897b 100644
--- a/t/app/controller/reports.t
+++ b/t/app/controller/reports.t
@@ -233,5 +233,54 @@ subtest "test greenwich all reports page" => sub {
     }
 };
 
-done_testing();
+subtest "it lists shortlisted reports" => sub {
+    FixMyStreet::override_config {
+        MAPIT_URL => 'http://mapit.mysociety.org/'
+    }, sub {
+        my $body = FixMyStreet::App->model('DB::Body')->find( $body_edin_id );
+        my $user = $mech->log_in_ok( 'test@example.com' );
+        $user->update({ from_body => $body });
+        $user->user_body_permissions->find_or_create({
+            body => $body,
+            permission_type => 'planned_reports',
+        });
+
+        my ($shortlisted_problem) = $mech->create_problems_for_body(1, $body_edin_id, 'Shortlisted report');
+        my ($unshortlisted_problem) = $mech->create_problems_for_body(1, $body_edin_id, 'Unshortlisted report');
+        my ($removed_from_shortlist_problem) = $mech->create_problems_for_body(1, $body_edin_id, 'Removed from shortlist report');
+
+        $user->add_to_planned_reports($shortlisted_problem);
+        $user->add_to_planned_reports($removed_from_shortlist_problem);
+        $user->remove_from_planned_reports($removed_from_shortlist_problem);
+
+        $mech->get_ok('/reports/City+of+Edinburgh+Council');
+        $mech->content_contains('<option value="shortlisted">Shortlisted</option>');
+        $mech->content_contains('<option value="unshortlisted">Unshortlisted</option>');
+
+        $mech->get_ok('/reports/City+of+Edinburgh+Council?status=shortlisted');
+
+        $mech->content_contains('Shortlisted report');
+        $mech->content_lacks('Unshortlisted report');
+        $mech->content_lacks('Removed from shortlist report');
 
+        $mech->get_ok('/reports/City+of+Edinburgh+Council?status=shortlisted,open');
+
+        $mech->content_contains('Shortlisted report');
+        $mech->content_lacks('Unshortlisted report');
+        $mech->content_lacks('Removed from shortlist report');
+
+        $mech->get_ok('/reports/City+of+Edinburgh+Council?status=unshortlisted,open');
+
+        $mech->content_contains('Unshortlisted report');
+        $mech->content_contains('Removed from shortlist report');
+        $mech->content_lacks('Shortlisted report');
+
+        $user->admin_user_body_permissions->delete;
+
+        $mech->get_ok('/reports/City+of+Edinburgh+Council');
+        $mech->content_lacks('<option value="shortlisted">Shortlisted</option>');
+        $mech->content_lacks('<option value="unshortlisted">Unshortlisted</option>');
+    };
+};
+
+done_testing();
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 05fe6123b..58be5cd50 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,5 +1,9 @@
 [% select_status = BLOCK %]
     <select class="form-control js-multiple" name="status" id="statuses" multiple data-all="[% loc('All reports') %]">
+      [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %]
+        <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option>
+        <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option>
+      [% END %]
         <option value="open"[% ' selected' IF filter_status.open %]>[% loc('Unfixed reports') %]</option>
         <option value="closed"[% ' selected' IF filter_status.closed %]>[% loc('Closed reports') %]</option>
         <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option>
-- 
cgit v1.2.3


From f68f2bd46607be6cc141034e66af62bd3f64d9dd Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Tue, 7 Feb 2017 09:44:34 +0000
Subject: Fix crash on reports with empty bodies_str

---
 perllib/FixMyStreet/DB/Result/Comment.pm |  5 ++++-
 t/app/controller/report_updates.t        | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 26ba89fda..cf1ba444d 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -292,7 +292,10 @@ sub meta_line {
             $update_state = _( 'marked as an internal referral' )
         }
 
-        if ($c->cobrand->moniker eq 'bromley' || $self->problem->bodies_str eq '2482') {
+        if ($c->cobrand->moniker eq 'bromley' || (
+                $self->problem->bodies_str &&
+                $self->problem->bodies_str eq '2482'
+        )) {
             if ($state eq 'not responsible') {
                 $update_state = 'marked as third party responsibility'
             }
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index 41d181e65..de153978b 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -131,6 +131,19 @@ for my $test (
     };
 }
 
+subtest "updates displayed on report with empty bodies_str" => sub {
+    my $old_bodies_str = $report->bodies_str;
+    $report->update({ bodies_str => undef });
+    $comment->update({ problem_state => 'fixed' , mark_open => 'false', mark_fixed => 'false' });
+
+    $mech->get_ok("/report/$report_id");
+
+    my $meta = $mech->extract_update_metas;
+    is scalar @$meta, 1, 'update displayed';
+
+    $report->update({ bodies_str => $old_bodies_str });
+};
+
 subtest "unconfirmed updates not displayed" => sub {
     $comment->state( 'unconfirmed' );
     $comment->update;
-- 
cgit v1.2.3


From 804506834e0ef7c1d6d9ab21dece21a18651295f Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 1 Feb 2017 12:50:22 +0000
Subject: [Oxfordshire] Allow cobrand-specific traffic management options

Fixes mysociety/fixmystreetforcouncils#159
---
 perllib/FixMyStreet/Cobrand/Default.pm     |  7 +++++++
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm |  9 +++++++++
 perllib/FixMyStreet/DB/Result/Problem.pm   | 13 +++++++++++++
 t/app/controller/report_inspect.t          | 10 ++++++++++
 templates/web/base/report/_inspect.html    |  5 +++--
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 56e365050..1fdbe9de2 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1188,4 +1188,11 @@ sub category_extra_hidden {
 	return 0;
 }
 
+sub traffic_management_options {
+    return [
+        _("Yes"),
+        _("No"),
+    ];
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index dca208e98..e58c7f36b 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -121,4 +121,13 @@ sub contact_email {
 
 sub admin_user_domain { 'oxfordshire.gov.uk' }
 
+sub traffic_management_options {
+    return [
+        "Signs and Cones",
+        "Stop and Go Boards",
+        "High Speed Roads",
+    ];
+}
+
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index e42e7110a..0092dd8b5 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -1056,4 +1056,17 @@ has duplicates => (
     },
 );
 
+has traffic_management_options => (
+    is => 'ro',
+    lazy => 1,
+    default => sub {
+        my $self = shift;
+        my $cobrand = $self->get_cobrand_logged;
+        if ( $cobrand->can('get_body_handler_for_problem') ) {
+            $cobrand = $cobrand->get_body_handler_for_problem( $self );
+        }
+        return $cobrand->traffic_management_options;
+    },
+);
+
 1;
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 1f11829b7..f092561db 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -186,6 +186,16 @@ FixMyStreet::override_config {
         $report->discard_changes;
         is $report->user->get_extra_metadata('reputation'), $reputation-1, "User reputation was decreased";
     };
+
+    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 => 'Planned', save_inspected => undef } });
+        $report->discard_changes;
+        is $report->state, 'planned', 'report state changed';
+        is $report->get_extra_metadata('traffic_information'), 'Signs and Cones', 'report data changed';
+    };
+
 };
 
 FixMyStreet::override_config {
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 43e86cb47..3118a49b6 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -108,8 +108,9 @@
           [% 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>
-            <option[% ' selected' IF traffic_info == "Yes" %]>Yes</option>
-            <option[% ' selected' IF traffic_info == "No" %]>No</option>
+            [% FOREACH option IN problem.traffic_management_options %]
+                <option value='[% option %]'[% ' selected' IF traffic_info == option %]>[% option %]</option>
+            [% END %]
           </select>
         </p>
         <p>
-- 
cgit v1.2.3


From 312df7e5b0224d9aff0767148879a854089e4ee1 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 30 Jan 2017 16:32:52 +0000
Subject: [Oxfordshire] Show simpler state list on inspect form

Limits the state dropdown to those states which will be useful to OCC
inspectors, as well as removing a few from the base template on the inspect
form. Some slight template refactoring has made it easier for other cobrands to
override the list, as well as sharing the template with the admin report_edit
form to allow all states to be selected.

Fixes mysociety/fixmystreetforcouncils#129
---
 t/app/controller/report_inspect.t                  |  8 ++++----
 templates/web/base/admin/state_groups_select.html  | 13 +-----------
 templates/web/base/report/_inspect.html            |  2 +-
 templates/web/base/report/_state_select_field.html | 12 +++++++++++
 .../base/report/inspect/state_groups_select.html   | 24 ++++++++++++++++++++++
 .../report/inspect/state_groups_select.html        | 21 +++++++++++++++++++
 6 files changed, 63 insertions(+), 17 deletions(-)
 create mode 100644 templates/web/base/report/_state_select_field.html
 create mode 100644 templates/web/base/report/inspect/state_groups_select.html
 create mode 100644 templates/web/oxfordshire/report/inspect/state_groups_select.html

diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index f092561db..9888fc0f4 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -57,9 +57,9 @@ FixMyStreet::override_config {
     };
 
     subtest "test basic inspect submission" => sub {
-        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Planned', save_inspected => undef } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Action Scheduled', save_inspected => undef } });
         $report->discard_changes;
-        is $report->state, 'planned', 'report state changed';
+        is $report->state, 'action scheduled', 'report state changed';
         is $report->get_extra_metadata('traffic_information'), 'Yes', 'report data changed';
     };
 
@@ -190,9 +190,9 @@ FixMyStreet::override_config {
     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 => 'Planned', save_inspected => undef } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Signs and Cones', state => 'Action Scheduled', save_inspected => undef } });
         $report->discard_changes;
-        is $report->state, 'planned', 'report state changed';
+        is $report->state, 'action scheduled', 'report state changed';
         is $report->get_extra_metadata('traffic_information'), 'Signs and Cones', 'report data changed';
     };
 
diff --git a/templates/web/base/admin/state_groups_select.html b/templates/web/base/admin/state_groups_select.html
index 229d181ab..9a70cd2c9 100644
--- a/templates/web/base/admin/state_groups_select.html
+++ b/templates/web/base/admin/state_groups_select.html
@@ -1,14 +1,3 @@
 [% PROCESS 'admin/report_blocks.html'; # For state_groups %]
 [% DEFAULT current_state = problem.state %]
-<select class="form-control" name="state"  id="state">
-[% IF include_empty %]
-    <option value="">---</option>
-[% END %]
-[% FOREACH group IN state_groups %]
-    <optgroup label="[% group.0 %]">
-    [% FOREACH state IN group.1 %]
-        <option [% 'selected ' IF state == current_state %] value="[% state %]">[% state_pretty.$state %]</option>
-    [% END %]
-    </optgroup>
-[% END %]
-</select>
+[% INCLUDE 'report/_state_select_field.html' %]
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 3118a49b6..5a7e99ef9 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -64,7 +64,7 @@
         [% IF permissions.report_inspect %]
           <p>
             <label for="state">[% loc('State') %]</label>
-            [% INCLUDE 'admin/state_groups_select.html' %]
+            [% INCLUDE 'report/inspect/state_groups_select.html' %]
           </p>
           <div id="js-duplicate-reports" class="[% "hidden" UNLESS problem.duplicate_of %]">
             <input type="hidden" name="duplicate_of" value="[% problem.duplicate_of.id %]">
diff --git a/templates/web/base/report/_state_select_field.html b/templates/web/base/report/_state_select_field.html
new file mode 100644
index 000000000..9b3ed18df
--- /dev/null
+++ b/templates/web/base/report/_state_select_field.html
@@ -0,0 +1,12 @@
+<select class="form-control" name="state"  id="state">
+[% IF include_empty %]
+    <option value="">---</option>
+[% END %]
+[% FOREACH group IN state_groups %]
+    <optgroup label="[% group.0 %]">
+    [% FOREACH state IN group.1 %]
+        <option [% 'selected ' IF state == current_state %] value="[% state %]">[% state_pretty.$state %]</option>
+    [% END %]
+    </optgroup>
+[% END %]
+</select>
diff --git a/templates/web/base/report/inspect/state_groups_select.html b/templates/web/base/report/inspect/state_groups_select.html
new file mode 100644
index 000000000..c4043751b
--- /dev/null
+++ b/templates/web/base/report/inspect/state_groups_select.html
@@ -0,0 +1,24 @@
+[%
+SET state_pretty = {
+    'confirmed' = loc('Open')
+    'investigating' = loc('Investigating')
+    'in progress' = loc('In progress')
+    'action scheduled' = loc('Action Scheduled')
+    'fixed - council' = loc('Fixed - Council')
+    'unable to fix' = loc('No further action')
+    'not responsible' = loc('Not Responsible')
+    'duplicate' = loc('Duplicate')
+    'internal referral' = loc('Internal referral')
+    'hidden' = loc('Hidden')
+};
+
+SET state_groups = [
+    [ loc('Open'), [ 'confirmed', 'investigating', 'in progress', 'action scheduled' ] ],
+    [ loc('Fixed'), [ 'fixed - council' ] ],
+    [ loc('Closed'), [ 'unable to fix', 'not responsible', 'duplicate', 'internal referral' ] ],
+    [ loc('Hidden'), [ 'hidden' ] ]
+];
+
+%]
+[% DEFAULT current_state = problem.state %]
+[% INCLUDE 'report/_state_select_field.html' %]
diff --git a/templates/web/oxfordshire/report/inspect/state_groups_select.html b/templates/web/oxfordshire/report/inspect/state_groups_select.html
new file mode 100644
index 000000000..d9db3864a
--- /dev/null
+++ b/templates/web/oxfordshire/report/inspect/state_groups_select.html
@@ -0,0 +1,21 @@
+[%
+SET state_pretty = {
+    'confirmed' = loc('Open')
+    'investigating' = loc('Investigating')
+    'action scheduled' = loc('Action Scheduled')
+    'fixed - council' = loc('Fixed')
+    'not responsible' = loc('Not Responsible')
+    'duplicate' = loc('Duplicate')
+    'unable to fix' = loc('No further action')
+};
+
+SET state_groups = [
+    [ loc('New'), [ 'confirmed', 'investigating' ] ],
+    [ loc('Scheduled'), [ 'action scheduled' ] ],
+    [ loc('Fixed'), [ 'fixed - council' ] ],
+    [ loc('Closed'), [ 'not responsible', 'duplicate', 'unable to fix' ] ]
+];
+
+%]
+[% DEFAULT current_state = problem.state %]
+[% INCLUDE 'report/_state_select_field.html' %]
-- 
cgit v1.2.3


From 8d0430990845f3949985c4539d31f55f4441c238 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 8 Feb 2017 18:01:35 +0000
Subject: [Harrogate] Remove unused cobrand

---
 perllib/FixMyStreet/Cobrand/Harrogate.pm           | 290 ---------------------
 templates/web/harrogate/about/faq-en-gb.html       | 134 ----------
 templates/web/harrogate/about/privacy.html         |  56 ----
 templates/web/harrogate/around/intro.html          |   4 -
 templates/web/harrogate/footer.html                |  42 ---
 .../web/harrogate/front/footer-marketing.html      |  19 --
 templates/web/harrogate/header_extra.html          |   7 -
 templates/web/harrogate/header_site.html           |  62 -----
 templates/web/harrogate/main_menu.html             |  20 --
 .../web/harrogate/report/new/after_category.html   |  17 --
 .../harrogate/report/new/councils_extra_text.html  |   1 -
 web/cobrands/harrogate/HBCLogo-cropped.png         | Bin 10091 -> 0 bytes
 web/cobrands/harrogate/HBCLogo-mobile.png          | Bin 2632 -> 0 bytes
 web/cobrands/harrogate/HBCLogo.png                 | Bin 7102 -> 0 bytes
 web/cobrands/harrogate/HBLogo.png                  | Bin 33025 -> 0 bytes
 web/cobrands/harrogate/_colours.scss               |  24 --
 web/cobrands/harrogate/_fonts.scss                 |   5 -
 web/cobrands/harrogate/_harrogate_header.scss      | 159 -----------
 .../harrogate/_harrogate_header_overrides.scss     |  65 -----
 web/cobrands/harrogate/base.scss                   |  93 -------
 web/cobrands/harrogate/icons/icons.data.png.css    | 157 -----------
 web/cobrands/harrogate/icons/icons.data.svg.css    | 157 -----------
 web/cobrands/harrogate/icons/icons.fallback.css    | 157 -----------
 .../harrogate/icons/png/arrow-down-white.png       | Bin 441 -> 0 bytes
 web/cobrands/harrogate/icons/png/arrow-down.png    | Bin 388 -> 0 bytes
 .../harrogate/icons/png/arrow-left-white.png       | Bin 468 -> 0 bytes
 web/cobrands/harrogate/icons/png/arrow-left.png    | Bin 395 -> 0 bytes
 .../harrogate/icons/png/arrow-up-white.png         | Bin 441 -> 0 bytes
 web/cobrands/harrogate/icons/png/arrow-up.png      | Bin 388 -> 0 bytes
 web/cobrands/harrogate/icons/png/arrow-white.png   | Bin 464 -> 0 bytes
 web/cobrands/harrogate/icons/png/arrow.png         | Bin 377 -> 0 bytes
 web/cobrands/harrogate/icons/png/balloons.png      | Bin 1418 -> 0 bytes
 .../harrogate/icons/png/benefits-assistance.png    | Bin 739 -> 0 bytes
 .../harrogate/icons/png/bins-recycling.png         | Bin 773 -> 0 bytes
 .../icons/png/business-and-investment.png          | Bin 699 -> 0 bytes
 .../harrogate/icons/png/business-investment.png    | Bin 773 -> 0 bytes
 web/cobrands/harrogate/icons/png/car-service.png   | Bin 985 -> 0 bytes
 web/cobrands/harrogate/icons/png/castle.png        | Bin 860 -> 0 bytes
 .../harrogate/icons/png/close-btn-dark.png         | Bin 356 -> 0 bytes
 web/cobrands/harrogate/icons/png/close-btn1.png    | Bin 398 -> 0 bytes
 web/cobrands/harrogate/icons/png/close-btn2.png    | Bin 372 -> 0 bytes
 web/cobrands/harrogate/icons/png/consultations.png | Bin 1096 -> 0 bytes
 web/cobrands/harrogate/icons/png/council-tax.png   | Bin 1083 -> 0 bytes
 .../harrogate/icons/png/crime-and-emergency.png    | Bin 990 -> 0 bytes
 .../harrogate/icons/png/crime-emergencies.png      | Bin 794 -> 0 bytes
 web/cobrands/harrogate/icons/png/elections.png     | Bin 1319 -> 0 bytes
 web/cobrands/harrogate/icons/png/envelope.png      | Bin 454 -> 0 bytes
 web/cobrands/harrogate/icons/png/error.png         | Bin 1101 -> 0 bytes
 .../harrogate/icons/png/events-celebrations.png    | Bin 1795 -> 0 bytes
 web/cobrands/harrogate/icons/png/events.png        | Bin 2015 -> 0 bytes
 web/cobrands/harrogate/icons/png/facebook.png      | Bin 396 -> 0 bytes
 web/cobrands/harrogate/icons/png/fax.png           | Bin 368 -> 0 bytes
 web/cobrands/harrogate/icons/png/flower.png        | Bin 912 -> 0 bytes
 web/cobrands/harrogate/icons/png/food-hygiene.png  | Bin 612 -> 0 bytes
 web/cobrands/harrogate/icons/png/forms.png         | Bin 825 -> 0 bytes
 .../harrogate/icons/png/gym-membership.png         | Bin 428 -> 0 bytes
 .../harrogate/icons/png/hamburger-menu-white.png   | Bin 320 -> 0 bytes
 .../harrogate/icons/png/hamburger-menu.png         | Bin 297 -> 0 bytes
 .../harrogate/icons/png/hamburger-menu2.png        | Bin 643 -> 0 bytes
 web/cobrands/harrogate/icons/png/harrogate-map.png | Bin 6440 -> 0 bytes
 .../harrogate/icons/png/health-and-safety.png      | Bin 1433 -> 0 bytes
 web/cobrands/harrogate/icons/png/health-safety.png | Bin 479 -> 0 bytes
 .../harrogate/icons/png/homes-property.png         | Bin 537 -> 0 bytes
 .../harrogate/icons/png/hydro-swimming-pool.png    | Bin 610 -> 0 bytes
 web/cobrands/harrogate/icons/png/icon-bank.png     | Bin 1567 -> 0 bytes
 web/cobrands/harrogate/icons/png/information.png   | Bin 1064 -> 0 bytes
 web/cobrands/harrogate/icons/png/jobs.png          | Bin 899 -> 0 bytes
 web/cobrands/harrogate/icons/png/leisure-sport.png | Bin 1231 -> 0 bytes
 .../harrogate/icons/png/licences-permissions.png   | Bin 744 -> 0 bytes
 .../icons/png/licensing-and-permissions.png        | Bin 1394 -> 0 bytes
 web/cobrands/harrogate/icons/png/link.png          | Bin 346 -> 0 bytes
 .../harrogate/icons/png/magnifying-glass-white.png | Bin 736 -> 0 bytes
 .../harrogate/icons/png/magnifying-glass.png       | Bin 952 -> 0 bytes
 web/cobrands/harrogate/icons/png/map-pointer.png   | Bin 525 -> 0 bytes
 web/cobrands/harrogate/icons/png/map.png           | Bin 6393 -> 0 bytes
 web/cobrands/harrogate/icons/png/menu-up.png       | Bin 309 -> 0 bytes
 web/cobrands/harrogate/icons/png/minus-btn.png     | Bin 176 -> 0 bytes
 .../harrogate/icons/png/missed-bin-collection.png  | Bin 638 -> 0 bytes
 .../harrogate/icons/png/museums-galleries.png      | Bin 592 -> 0 bytes
 .../harrogate/icons/png/parking-travel.png         | Bin 955 -> 0 bytes
 web/cobrands/harrogate/icons/png/parking.png       | Bin 786 -> 0 bytes
 .../harrogate/icons/png/parks-openspaces.png       | Bin 1263 -> 0 bytes
 web/cobrands/harrogate/icons/png/payments.png      | Bin 826 -> 0 bytes
 web/cobrands/harrogate/icons/png/pest-control.png  | Bin 2401 -> 0 bytes
 web/cobrands/harrogate/icons/png/phone.png         | Bin 293 -> 0 bytes
 web/cobrands/harrogate/icons/png/pin.png           | Bin 341 -> 0 bytes
 .../icons/png/planning-and-development.png         | Bin 1094 -> 0 bytes
 .../harrogate/icons/png/planning-development.png   | Bin 630 -> 0 bytes
 .../harrogate/icons/png/planning-permission.png    | Bin 450 -> 0 bytes
 web/cobrands/harrogate/icons/png/plus-btn.png      | Bin 277 -> 0 bytes
 web/cobrands/harrogate/icons/png/recycling.png     | Bin 1425 -> 0 bytes
 web/cobrands/harrogate/icons/png/red-arrow.png     | Bin 529 -> 0 bytes
 .../harrogate/icons/png/register-to-vote.png       | Bin 517 -> 0 bytes
 web/cobrands/harrogate/icons/png/rss.png           | Bin 707 -> 0 bytes
 web/cobrands/harrogate/icons/png/twitter1.png      | Bin 915 -> 0 bytes
 web/cobrands/harrogate/icons/png/twitter2.png      | Bin 532 -> 0 bytes
 web/cobrands/harrogate/icons/png/warning.png       | Bin 875 -> 0 bytes
 .../harrogate/icons/png/your-community.png         | Bin 1270 -> 0 bytes
 web/cobrands/harrogate/icons/png/your-council.png  | Bin 1019 -> 0 bytes
 .../harrogate/icons/png/your-environment.png       | Bin 1557 -> 0 bytes
 web/cobrands/harrogate/icons/png/youtube.png       | Bin 429 -> 0 bytes
 web/cobrands/harrogate/js.js                       |  34 ---
 web/cobrands/harrogate/layout.scss                 | 118 ---------
 103 files changed, 1621 deletions(-)
 delete mode 100644 perllib/FixMyStreet/Cobrand/Harrogate.pm
 delete mode 100755 templates/web/harrogate/about/faq-en-gb.html
 delete mode 100755 templates/web/harrogate/about/privacy.html
 delete mode 100644 templates/web/harrogate/around/intro.html
 delete mode 100644 templates/web/harrogate/footer.html
 delete mode 100644 templates/web/harrogate/front/footer-marketing.html
 delete mode 100644 templates/web/harrogate/header_extra.html
 delete mode 100644 templates/web/harrogate/header_site.html
 delete mode 100644 templates/web/harrogate/main_menu.html
 delete mode 100644 templates/web/harrogate/report/new/after_category.html
 delete mode 100644 templates/web/harrogate/report/new/councils_extra_text.html
 delete mode 100755 web/cobrands/harrogate/HBCLogo-cropped.png
 delete mode 100755 web/cobrands/harrogate/HBCLogo-mobile.png
 delete mode 100644 web/cobrands/harrogate/HBCLogo.png
 delete mode 100755 web/cobrands/harrogate/HBLogo.png
 delete mode 100644 web/cobrands/harrogate/_colours.scss
 delete mode 100644 web/cobrands/harrogate/_fonts.scss
 delete mode 100644 web/cobrands/harrogate/_harrogate_header.scss
 delete mode 100644 web/cobrands/harrogate/_harrogate_header_overrides.scss
 delete mode 100644 web/cobrands/harrogate/base.scss
 delete mode 100644 web/cobrands/harrogate/icons/icons.data.png.css
 delete mode 100644 web/cobrands/harrogate/icons/icons.data.svg.css
 delete mode 100644 web/cobrands/harrogate/icons/icons.fallback.css
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-down-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-down.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-left-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-left.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-up-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-up.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/arrow.png
 delete mode 100644 web/cobrands/harrogate/icons/png/balloons.png
 delete mode 100644 web/cobrands/harrogate/icons/png/benefits-assistance.png
 delete mode 100644 web/cobrands/harrogate/icons/png/bins-recycling.png
 delete mode 100644 web/cobrands/harrogate/icons/png/business-and-investment.png
 delete mode 100644 web/cobrands/harrogate/icons/png/business-investment.png
 delete mode 100644 web/cobrands/harrogate/icons/png/car-service.png
 delete mode 100644 web/cobrands/harrogate/icons/png/castle.png
 delete mode 100644 web/cobrands/harrogate/icons/png/close-btn-dark.png
 delete mode 100644 web/cobrands/harrogate/icons/png/close-btn1.png
 delete mode 100644 web/cobrands/harrogate/icons/png/close-btn2.png
 delete mode 100644 web/cobrands/harrogate/icons/png/consultations.png
 delete mode 100644 web/cobrands/harrogate/icons/png/council-tax.png
 delete mode 100644 web/cobrands/harrogate/icons/png/crime-and-emergency.png
 delete mode 100644 web/cobrands/harrogate/icons/png/crime-emergencies.png
 delete mode 100644 web/cobrands/harrogate/icons/png/elections.png
 delete mode 100644 web/cobrands/harrogate/icons/png/envelope.png
 delete mode 100644 web/cobrands/harrogate/icons/png/error.png
 delete mode 100644 web/cobrands/harrogate/icons/png/events-celebrations.png
 delete mode 100644 web/cobrands/harrogate/icons/png/events.png
 delete mode 100644 web/cobrands/harrogate/icons/png/facebook.png
 delete mode 100644 web/cobrands/harrogate/icons/png/fax.png
 delete mode 100644 web/cobrands/harrogate/icons/png/flower.png
 delete mode 100644 web/cobrands/harrogate/icons/png/food-hygiene.png
 delete mode 100644 web/cobrands/harrogate/icons/png/forms.png
 delete mode 100644 web/cobrands/harrogate/icons/png/gym-membership.png
 delete mode 100644 web/cobrands/harrogate/icons/png/hamburger-menu-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/hamburger-menu.png
 delete mode 100644 web/cobrands/harrogate/icons/png/hamburger-menu2.png
 delete mode 100644 web/cobrands/harrogate/icons/png/harrogate-map.png
 delete mode 100644 web/cobrands/harrogate/icons/png/health-and-safety.png
 delete mode 100644 web/cobrands/harrogate/icons/png/health-safety.png
 delete mode 100644 web/cobrands/harrogate/icons/png/homes-property.png
 delete mode 100644 web/cobrands/harrogate/icons/png/hydro-swimming-pool.png
 delete mode 100644 web/cobrands/harrogate/icons/png/icon-bank.png
 delete mode 100644 web/cobrands/harrogate/icons/png/information.png
 delete mode 100644 web/cobrands/harrogate/icons/png/jobs.png
 delete mode 100644 web/cobrands/harrogate/icons/png/leisure-sport.png
 delete mode 100644 web/cobrands/harrogate/icons/png/licences-permissions.png
 delete mode 100644 web/cobrands/harrogate/icons/png/licensing-and-permissions.png
 delete mode 100644 web/cobrands/harrogate/icons/png/link.png
 delete mode 100644 web/cobrands/harrogate/icons/png/magnifying-glass-white.png
 delete mode 100644 web/cobrands/harrogate/icons/png/magnifying-glass.png
 delete mode 100644 web/cobrands/harrogate/icons/png/map-pointer.png
 delete mode 100644 web/cobrands/harrogate/icons/png/map.png
 delete mode 100644 web/cobrands/harrogate/icons/png/menu-up.png
 delete mode 100644 web/cobrands/harrogate/icons/png/minus-btn.png
 delete mode 100644 web/cobrands/harrogate/icons/png/missed-bin-collection.png
 delete mode 100644 web/cobrands/harrogate/icons/png/museums-galleries.png
 delete mode 100644 web/cobrands/harrogate/icons/png/parking-travel.png
 delete mode 100644 web/cobrands/harrogate/icons/png/parking.png
 delete mode 100644 web/cobrands/harrogate/icons/png/parks-openspaces.png
 delete mode 100644 web/cobrands/harrogate/icons/png/payments.png
 delete mode 100644 web/cobrands/harrogate/icons/png/pest-control.png
 delete mode 100644 web/cobrands/harrogate/icons/png/phone.png
 delete mode 100644 web/cobrands/harrogate/icons/png/pin.png
 delete mode 100644 web/cobrands/harrogate/icons/png/planning-and-development.png
 delete mode 100644 web/cobrands/harrogate/icons/png/planning-development.png
 delete mode 100644 web/cobrands/harrogate/icons/png/planning-permission.png
 delete mode 100644 web/cobrands/harrogate/icons/png/plus-btn.png
 delete mode 100644 web/cobrands/harrogate/icons/png/recycling.png
 delete mode 100644 web/cobrands/harrogate/icons/png/red-arrow.png
 delete mode 100644 web/cobrands/harrogate/icons/png/register-to-vote.png
 delete mode 100644 web/cobrands/harrogate/icons/png/rss.png
 delete mode 100644 web/cobrands/harrogate/icons/png/twitter1.png
 delete mode 100644 web/cobrands/harrogate/icons/png/twitter2.png
 delete mode 100644 web/cobrands/harrogate/icons/png/warning.png
 delete mode 100644 web/cobrands/harrogate/icons/png/your-community.png
 delete mode 100644 web/cobrands/harrogate/icons/png/your-council.png
 delete mode 100644 web/cobrands/harrogate/icons/png/your-environment.png
 delete mode 100644 web/cobrands/harrogate/icons/png/youtube.png
 delete mode 100644 web/cobrands/harrogate/js.js
 delete mode 100644 web/cobrands/harrogate/layout.scss

diff --git a/perllib/FixMyStreet/Cobrand/Harrogate.pm b/perllib/FixMyStreet/Cobrand/Harrogate.pm
deleted file mode 100644
index 8f4a6e2ea..000000000
--- a/perllib/FixMyStreet/Cobrand/Harrogate.pm
+++ /dev/null
@@ -1,290 +0,0 @@
-package FixMyStreet::Cobrand::Harrogate;
-use base 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-use feature 'say';
-
-sub council_id { return 2407; }
-sub council_area { return 'Harrogate'; }
-sub council_name { return 'Harrogate Borough Council'; }
-sub council_url { return 'harrogate'; }
-sub is_two_tier { return 1; } # with North Yorkshire CC 2235
-
-sub base_url {
-    my $self = shift;
-    return $self->next::method() if FixMyStreet->config('STAGING_SITE');
-    return 'http://fix.harrogate.gov.uk';
-}
-
-sub disambiguate_location {
-    my $self    = shift;
-    my $string  = shift;
-
-    my $town = 'Harrogate';
-
-    # as it's the requested example location, try to avoid a disambiguation page
-    $town .= ', HG1 1DH' if $string =~ /^\s*king'?s\s+r(?:oa)?d\s*(?:,\s*har\w+\s*)?$/i;
-
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        town   => $town,
-        centre => '54.0671557690306,-1.59581319536637',
-        span   => '0.370193897090822,0.829517054931808',
-        bounds => [ 53.8914112467619, -2.00450542308575, 54.2616051438527, -1.17498836815394 ],
-    };
-}
-
-sub example_places {
-    return ( 'HG1 2SG', "King's Road" );
-}
-
-sub enter_postcode_text {
-    my ($self) = @_;
-    return 'Enter a Harrogate district postcode, or street name and area';
-}
-
-# increase map zoom level so street names are visible
-sub default_map_zoom { return 3; }
-
-
-=head2 temp_email_to_update, temp_update_contacts
-
-Temporary helper routines to update the extra for potholes (temporary setup
-hack, cargo-culted from ESCC, may in future be superseded either by
-Open311/integration or a better mechanism for manually creating rich contacts).
-
-Can run with a script or command line like:
-
- bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::Harrogate -e \
- 'FixMyStreet::Cobrand::Harrogate->new({c => FixMyStreet::App->new})->temp_update_contacts'
-
-=cut
-
-sub temp_email_to_update {
-    return 'CustomerServices@harrogate.gov.uk';
-}
-
-sub temp_update_contacts {
-    my $self = shift;
-
-    my $contact_rs = $self->{c}->model('DB::Contact');
-
-    my $email = $self->temp_email_to_update;
-    my $_update = sub {
-        my ($category, $field, $category_details) = @_; 
-        # NB: we're accepting just 1 field, but supply as array [ $field ]
-
-        my $contact = $contact_rs->find_or_create(
-            {
-                body_id => $self->council_id,
-                category => $category,
-
-                confirmed => 1,
-                deleted => 0,
-                email => $email,
-                editor => 'automated script',
-                note => '',
-                send_method => '',
-                whenedited => \'NOW()',
-                %{ $category_details || {} },
-            },
-            {
-                key => 'contacts_body_id_category_idx'
-            }
-        );
-
-        say "Editing category: $category";
-
-        my %default = (
-            variable => 'true',
-            order => '1',
-            required => 'no',
-            datatype => 'string',
-            datatype_description => 'a string',
-        );
-
-        if ($field->{datatype} || '' eq 'boolean') {
-            my $description = $field->{description};
-            %default = (
-                %default,
-                datatype => 'singlevaluelist',
-                datatype_description => 'Yes or No',
-                values => { value => [ 
-                        { key => ['No'],  name => ['No'] },
-                        { key => ['Yes'], name => ['Yes'] }, 
-                ] },
-            );
-        }
-
-        $contact->update({
-            # XXX: we're just setting extra with the expected layout,
-            # this could be encapsulated more nicely
-            extra => { _fields => [ { %default, %$field } ] },
-            confirmed => 1,
-            deleted => 0,
-            editor => 'automated script',
-            whenedited => \'NOW()',
-            note => 'Edited by script as per requirements Dec 2014',
-        });
-    };
-
-    $_update->( 'Abandoned vehicles', {
-            code => 'registration',
-            description => 'Vehicle Registration number:',
-        });
-
-    $_update->( 'Dead animals', {
-            code => 'INFO_TEXT',
-            variable => 'false',
-            description => 'We do not remove small species, e.g. squirrels, rabbits, and small birds.',
-        });
-
-    $_update->( 'Flyposting', {
-            code => 'offensive',
-            description => 'Is it offensive?',
-            datatype => 'boolean', # mapped onto singlevaluelist
-        });
-
-    $_update->( 'Flytipping', {
-            code => 'size',
-            description => 'Size?',
-            datatype => 'singlevaluelist',
-            values => { value => [ 
-                    { key => ['Single Item'],       name => ['Single item'] },
-                    { key => ['Car boot load'],     name => ['Car boot load'] },
-                    { key => ['Small van load'],    name => ['Small van load'] },
-                    { key => ['Transit van load'],  name => ['Transit van load'] },
-                    { key => ['Tipper lorry load'], name => ['Tipper lorry load'] },
-                    { key => ['Significant load'],  name => ['Significant load'] },
-                ] },
-        });
-
-    $_update->( 'Graffiti', {
-            code => 'offensive',
-            description => 'Is it offensive?',
-            datatype => 'boolean', # mapped onto singlevaluelist
-        });
-
-    $_update->( 'Parks and playgrounds', {
-            code => 'dangerous',
-            description => 'Is it dangerous or could cause injury?',
-            datatype => 'boolean', # mapped onto singlevaluelist
-        });
-
-    $_update->( 'Trees', {
-            code => 'dangerous',
-            description => 'Is it dangerous or could cause injury?',
-            datatype => 'boolean', # mapped onto singlevaluelist
-        });
-
-    # also ensure that the following categories are created:
-    for my $category (
-        'Car parking',
-        'Dog and litter bins',
-        'Dog fouling',
-        'Other',
-        'Rubbish (refuse and recycling)',
-        'Street cleaning',
-        'Street lighting',
-        'Street nameplates',
-    ) {
-        say "Creating $category if required";
-        my $contact = $contact_rs->find_or_create(
-            {
-                body_id => $self->council_id,
-                category => $category,
-                confirmed => 1,
-                deleted => 0,
-                email => $email,
-                editor => 'automated script',
-                note => 'Created by script as per requirements Dec 2014',
-                send_method => '',
-                whenedited => \'NOW()',
-            }
-        );
-    }
-
-    my @to_delete = (
-        'Parks/landscapes', # delete in favour of to parks and playgrounds
-        'Public toilets',   # as no longer in specs
-    );
-    say sprintf "Deleting: %s (if present)", join ',' => @to_delete;
-    $contact_rs->search({
-        body_id => $self->council_id,
-        category => \@to_delete,
-        deleted => 0
-    })->update({
-        deleted => 1,
-        editor => 'automated script',
-        whenedited => \'NOW()',
-        note => 'Deleted by script as per requirements Dec 2014',
-    });
-}
-
-sub contact_email {
-    my $self = shift;
-    return join( '@', 'customerservices', 'harrogate.gov.uk' );
-}
-
-sub process_additional_metadata_for_email {
-    my ($self, $problem, $h) = @_;
-
-    my $additional = '';
-    if (my $extra = $problem->get_extra_fields) {
-        $additional = join "\n\n", map {
-            if ($_->{name} eq 'INFO_TEXT') {
-                ();
-            }
-            else {
-                sprintf '%s: %s', $_->{description}, $_->{value};
-            }
-        } @$extra;
-        $additional = "\n\n$additional" if $additional;
-    }
-
-    $h->{additional_information} = $additional;
-}
-
-sub send_questionnaires {
-    return 0;
-}
-
-sub munge_category_list {
-    my ($self, $categories_ref, $contacts_ref, $extras_ref) = @_;
-
-    # we want to know which contacts *only* belong to NYCC
-    # that's because for shared responsibility, we don't expect
-    # the user to have to figure out which authority to contact.
-
-    # so we start building up the list of both
-    my (%harrogate_contacts, %nycc_contacts);
-
-    my $harrogate_id = $self->council_id; # XXX: note reference to council_id as body id!
-    for my $contact (@$contacts_ref) {
-        my $category = $contact->category;
-        if ($contact->body_id == $harrogate_id) {
-            $harrogate_contacts{$category} = 1;
-        }
-        else {
-            $nycc_contacts{$category}++;
-        }
-    }
-
-    # and then remove any that also have Harrogate involvement
-    delete $nycc_contacts{$_} for keys %harrogate_contacts;
-
-    # here, we simply *mark* the text with (NYCC) at the end, and
-    # the rest will get done in the template with javascript
-    my @categories = map {
-        $nycc_contacts{$_} ?
-            "$_ (NYCC)"
-            : $_
-    } @$categories_ref;
-
-    # replace the entire list with this transformed one
-    @$categories_ref = @categories;
-}
-
-1;
-
diff --git a/templates/web/harrogate/about/faq-en-gb.html b/templates/web/harrogate/about/faq-en-gb.html
deleted file mode 100755
index e5c9e5480..000000000
--- a/templates/web/harrogate/about/faq-en-gb.html
+++ /dev/null
@@ -1,134 +0,0 @@
-[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %]
-
-<div class="sticky-sidebar">
-    <aside>
-        <ul class="plain-list">
-            <li><a href="#faq">Frequently Asked Questions</a></li>
-            <li><a href="/privacy">Privacy and cookies</a></li>
-            <li><a href="/contact">Contact FixMyStreet</a></li>
-        </ul>
-    </aside>
-</div>
-
-<h1> Frequently Asked Questions </h1>
-
-<p>These pages are for reporting things which are broken, dirty, damaged or
-dumped, and need fixing, cleaning or clearing: </p>
-<ul>
-    <li>graffiti
-    <li>flytipping
-    <li>broken playground equipment
-    <li>street lighting
-    <li>potholes
-    </ul>
-    <p>
-    Note that though most of these services are provided by Harrogate Borough Council, 
-    FixMyStreet will forward some categories of issue to North Yorkshire County Council.
-    </p>
-
-<dl>
-    <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> Issues reported via the website are only actioned during office hours.
-    If you require an Out of Hours service please ring our main number 
-    01423 500600 and a message will direct you to the relevant Council Out of Hours
-    service. </p>
-
-    </dd>
-
-        <dt>How do I report a problem here?</dt>
-        <dd>After entering a postcode or location, you are shown
-a map of that area. You can view problems already reported in that area,
-or report ones of your own by clicking on the map at the location of
-the problem.</dd>
-        <dt>How are the problems solved?</dt>
-        <dd>They are reported directly to us so we can then resolve the problem.
-        You can also discuss the problem on the website with others if you wish.</dd>
-
-        <dt>Do you remove silly or illegal content?</dt>
-        <dd>Harrogate Borough Council and FixMyStreet are 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.</dd>
-
-    <dt>Can I use FixMyStreet on my mobile?</dt>
-    <dd>
-    <p>The FixMyStreet website will already work on your mobile phone, adapting to
-    the size of your screen automatically. Using an app has some advantages, though
-	&mdash; for example, you can create a report even when you have no network 
-	connection.
-	<ul>
-	    <li>
-			<a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a>		
-	    <li>
-			<a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a>
-	    <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
-			<a href="http://store.ovi.com/content/107557">Ovi Store</a>.
-	</ul>
-    </dd>
-
-    <dt>Can I use these pages to report problems outside of the Harrogate district?</dd>
-    <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</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
-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
-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>
-
-    <dt>Why does the site use kilometres for measurements?</dt>
-    <dd>The British national
-    grid reference system, devised by Ordnance Survey (the British national
-    mapping agency) around the time of the second world war, uses eastings and
-    northings measured in metres and kilometres; the maps we use are from
-    Ordnance Survey and so this is what we use to display distances.
-    There you have it: not everything British is in miles!</dd>
-
-    <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
-    <dd>We want to keep reports locally focused, so we restrict the ability to
-    move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all
-    the reports you&rsquo;ve made, wherever they are.</dd>
-
-        <dt>I&rsquo;d like a site like this for my own location/ where&rsquo;s the "source code" to this site?</dt>
-        <dd>
-The mySociety software behind this site is open source, and available
-under the GNU Affero GPL software license. You can <a
-href="http://github.com/mysociety/fixmystreet">download the
-source code</a> and help mySociety develop it.
-You&rsquo;re welcome to use it in your own projects, although you must also
-make available the source code to any such projects.
-<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code
-being used in a Norwegian version of this site.
-</dd>
-
-</dl>
-
-    <h2><a name="privacy"></a>Privacy Questions</h2>
-
-    <dl>
-        <dt>Who gets to see my email address?</dt>
-        <dd>
-<p>If you submit a problem, your details, and details of the problem, will be
-submitted to Harrogate Borough Council, or North Yorkshire County Council, as
-appropriate. Other than the council, only people we authorise to view the
-FixMyStreet administration interface will be able to see your email address and
-they will never use it for anything other than to help administer
-FixMyStreet.</p>
-<p>We will never give or sell your email address to anyone else, unless we are
-obliged to by law. Your name will not be published anywhere unless you let us.</p>
-</dd>
-
-        <dt>What emails will you send to me?</dt>
-        <dd>We will email you when we have received your report, and when it has
-        been investigated and actioned. We will only send you emails that
-        relate to an issue you have reported.</dd>
-
-    </dl>
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/harrogate/about/privacy.html b/templates/web/harrogate/about/privacy.html
deleted file mode 100755
index 767f80fbf..000000000
--- a/templates/web/harrogate/about/privacy.html
+++ /dev/null
@@ -1,56 +0,0 @@
-[% INCLUDE 'header.html',
-    title = loc('Frequently Asked Questions'),
-    bodyclass = 'twothirdswidthpage' %]
-
-<div class="sticky-sidebar">
-    <aside>
-        <ul class="plain-list">
-            <li><a href="/faq">Frequently Asked Questions</a></li>
-            <li><strong>Privacy and cookies</strong></li>
-            <li><a href="/contact">Contact [% site_name %]</a></li>
-        </ul>
-    </aside>
-</div>
-
-<h1>Privacy, cookies, and third party services</h1>
-
-<p><strong>Our use of your data, cookies, and external services: what you
-should know, and how to opt out if you want to.</strong></p>
-
-<h2>Privacy</h2>
-
-    <dl>
-        <dt>Who gets to see my email address?</dt>
-        <dd>
-            <p>If you submit a problem, your details, and details of the problem, will be
-            submitted to Harrogate Borough Council, or North Yorkshire County Council, as
-            appropriate. Other than the council, only people we authorise to view the
-            FixMyStreet administration interface will be able to see your email address and
-            they will never use it for anything other than to help administer
-            FixMyStreet.</p>
-            <p>We will never give or sell your email address to anyone else, unless we are
-            obliged to by law. Your name will not be published anywhere unless you let us.</p>
-        </dd>
-
-        <dt>What emails will you send to me?</dt>
-        <dd>We will email you when we have received your report, and when it has
-        been investigated and actioned. We will only send you emails that
-        relate to an issue you have reported.</dd>
-
-    </dl>
-    <dl>
-
-<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. Below, we list the cookies and
-services that this site can use.
-
-<table cellpadding=5>
-<tr align="left"><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>
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/harrogate/around/intro.html b/templates/web/harrogate/around/intro.html
deleted file mode 100644
index 53476965d..000000000
--- a/templates/web/harrogate/around/intro.html
+++ /dev/null
@@ -1,4 +0,0 @@
-            <div id="postcode-intro">
-                <h1> Report something in Harrogate district that needs to be fixed, cleaned, or cleared. </h1>
-                <h2> (like graffiti, fly tipping, broken playground equipment, or street lighting) </h2>
-            </div>
diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html
deleted file mode 100644
index 2cbe8f986..000000000
--- a/templates/web/harrogate/footer.html
+++ /dev/null
@@ -1,42 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--main' %]
-                </div>
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% IF pagefooter %]
-    <footer class="site-footer">
-        <div class="container">
-            <section class="site-footer__useful-links">
-                <h2 class="site-footer__heading">Useful links</h2>
-                <ul class="site-footer__list item-list item-list--inline">
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.harrogate.gov.uk/accessibility">Accessibility</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.harrogate.gov.uk/contactus">Contact us</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.harrogate.gov.uk/feedback">Feedback</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.harrogate.gov.uk/terms">Terms of use</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.harrogate.gov.uk/cookies">Privacy and cookies</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="http://www.northyorks.gov.uk/" target="_blank">North Yorkshire County Council</a></li>
-                    <li class="site-footer__list__item item-list__item"><a class="site-footer__link" href="https://www.gov.uk/" target="_blank">GOV.UK</a></li>
-                    <!-- <li><a href="https://www.harrogate.gov.uk/site_map" rel="nofollow">Site map</a></li> -->
-                </ul>
-                <p class="site-footer__rights">© 2016 Harrogate Borough Council</p>
-                <p class="site-footer__rights-two">
-                    Powered by <a class="platform-logo" href="https://fixmystreet.com/about/council/">FixMyStreet for Councils</a>
-                </p>
-            </section>
-        </div>
-    </footer>
-    [% END %]
-
-    [% INCLUDE 'common_footer_tags.html' %]
-    <script src="[% version('/cobrands/harrogate/js.js') %]"></script>
-
-</body>
-</html>
diff --git a/templates/web/harrogate/front/footer-marketing.html b/templates/web/harrogate/front/footer-marketing.html
deleted file mode 100644
index 495a17fc5..000000000
--- a/templates/web/harrogate/front/footer-marketing.html
+++ /dev/null
@@ -1,19 +0,0 @@
-                        <div class="tablewrapper bordered">
-                            <div id="footer-mobileapps">
-                                <h4>The FixMyStreet App</h4>
-                                <p>
-                                      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">
-                                      <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" />
-                                      </a>
-                                      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">
-                                      <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" />
-                                      </a>
-                                    </p>
-                                </div>
-
-                            <div id="footer-help">
-                                <p>
-                                Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>
-                                </p>
-                            </div>
-                        </div>
diff --git a/templates/web/harrogate/header_extra.html b/templates/web/harrogate/header_extra.html
deleted file mode 100644
index 9e75ea274..000000000
--- a/templates/web/harrogate/header_extra.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Grunticon -->
-<script>
-!/*! grunt-grunticon Stylesheet Loader - v2.1.6 | https://github.com/filamentgroup/grunticon | (c) 2015 Scott Jehl, Filament Group, Inc. | MIT license. */
-!function(){function e(e,n,t){"use strict";var o=window.document.createElement("link"),r=n||window.document.getElementsByTagName("script")[0],a=window.document.styleSheets;return o.rel="stylesheet",o.href=e,o.media="only x",r.parentNode.insertBefore(o,r),o.onloadcssdefined=function(e){for(var n,t=0;t<a.length;t++)a[t].href&&a[t].href===o.href&&(n=!0);n?e():setTimeout(function(){o.onloadcssdefined(e)})},o.onloadcssdefined(function(){o.media=t||"all"}),o}function n(e,n){e.onload=function(){e.onload=null,n&&n.call(e)},"isApplicationInstalled"in navigator&&"onloadcssdefined"in e&&e.onloadcssdefined(n)}!function(t){var o=function(r,a){"use strict";if(r&&3===r.length){var i=t.navigator,c=t.document,s=t.Image,d=!(!c.createElementNS||!c.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect||!c.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")||t.opera&&-1===i.userAgent.indexOf("Chrome")||-1!==i.userAgent.indexOf("Series40")),l=new s;l.onerror=function(){o.method="png",o.href=r[2],e(r[2])},l.onload=function(){var t=1===l.width&&1===l.height,i=r[t&&d?0:t?1:2];t&&d?o.method="svg":t?o.method="datapng":o.method="png",o.href=i,n(e(i),a)},l.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",c.documentElement.className+=" grunticon"}};o.loadCSS=e,o.onloadCSS=n,t.grunticon=o}(this),function(e,n){"use strict";var t=n.document,o="grunticon:",r=function(e){if(t.attachEvent?"complete"===t.readyState:"loading"!==t.readyState)e();else{var n=!1;t.addEventListener("readystatechange",function(){n||(n=!0,e())},!1)}},a=function(e){return n.document.querySelector('link[href$="'+e+'"]')},i=function(e){var n,t,r,a,i,c,s={};if(n=e.sheet,!n)return s;t=n.cssRules?n.cssRules:n.rules;for(var d=0;d<t.length;d++)r=t[d].cssText,a=o+t[d].selectorText,i=r.split(");")[0].match(/US\-ASCII\,([^"']+)/),i&&i[1]&&(c=decodeURIComponent(i[1]),s[a]=c);return s},c=function(e){var n,r,a,i;a="data-grunticon-embed";for(var c in e){i=c.slice(o.length);try{n=t.querySelectorAll(i)}catch(s){continue}r=[];for(var d=0;d<n.length;d++)null!==n[d].getAttribute(a)&&r.push(n[d]);if(r.length)for(d=0;d<r.length;d++)r[d].innerHTML=e[c],r[d].style.backgroundImage="none",r[d].removeAttribute(a)}return r},s=function(n){"svg"===e.method&&r(function(){c(i(a(e.href))),"function"==typeof n&&n()})};e.embedIcons=c,e.getCSS=a,e.getIcons=i,e.ready=r,e.svgLoadedCallback=s,e.embedSVG=s}(grunticon,this)}();
-grunticon(["[% version('/cobrands/harrogate/icons/icons.data.svg.css') %]", "[% version('/cobrands/harrogate/icons/icons.data.png.css') %]", "[% version('/cobrands/harrogate/icons/icons.fallback.css') %]"], grunticon.svgLoadedCallback);
-</script>
-<noscript><link rel="stylesheet" href="dist/icons/icons.fallback.css"></noscript>
diff --git a/templates/web/harrogate/header_site.html b/templates/web/harrogate/header_site.html
deleted file mode 100644
index 625d40c7a..000000000
--- a/templates/web/harrogate/header_site.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<header class="site-header" id="site-header">
-        <div class="container ">
-            <div class="site-header__identity">
-                <div class="site-header__identity__logo">
-                    <a href="http://www.harrogate.gov.uk">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="400" height="135" viewBox="0 0 400 135"><title>harrogate</title><path d="M9.78,105.78H20.11q4.59,0,6.87,1.64a5.65,5.65,0,0,1,2.28,4.91,5.52,5.52,0,0,1-1.09,3.44A6,6,0,0,1,25,117.84v0.09a7,7,0,0,1,4.47,2.16,6.65,6.65,0,0,1,1.57,4.6,6.41,6.41,0,0,1-2.63,5.68q-2.63,1.81-8.27,1.81H9.78V105.78Zm4.1,3.44v7.38H20a6.84,6.84,0,0,0,4-.88,3.26,3.26,0,0,0,1.2-2.83,3.08,3.08,0,0,0-1.38-2.77,7.87,7.87,0,0,0-4.24-.9H13.89Zm0,10.7v8.77h7a7.31,7.31,0,0,0,4.38-1.07,3.84,3.84,0,0,0,1.44-3.28A3.89,3.89,0,0,0,25.3,121a7.22,7.22,0,0,0-4.37-1.09h-7ZM48.2,105a14.29,14.29,0,0,1,5,.84,12.06,12.06,0,0,1,4,2.45A13,13,0,0,1,60.46,113a16.73,16.73,0,0,1,.06,11.68,13.22,13.22,0,0,1-2.9,4.56A12.12,12.12,0,0,1,53.45,132a14.14,14.14,0,0,1-5.24.93A13.83,13.83,0,0,1,43,132a12.3,12.3,0,0,1-4.27-2.85,13.13,13.13,0,0,1-2.84-4.49,15.87,15.87,0,0,1-.94-5.61,15.71,15.71,0,0,1,1-5.65,13.23,13.23,0,0,1,2.93-4.53A12.2,12.2,0,0,1,43,106,13.75,13.75,0,0,1,48.2,105Zm0,3.47A7.59,7.59,0,0,0,42,111.44a11.75,11.75,0,0,0-2.39,7.67,11.21,11.21,0,0,0,2.4,7.46,7.72,7.72,0,0,0,6.2,2.86,7.63,7.63,0,0,0,6.17-2.88,13.19,13.19,0,0,0,0-15.13A7.68,7.68,0,0,0,48.2,108.51Zm18.15-2.73H76.68q4.94,0,7.47,1.77a6,6,0,0,1,2.53,5.22,6.12,6.12,0,0,1-1.35,4.07,5.44,5.44,0,0,1-3.64,1.9l0,0.13a4.93,4.93,0,0,1,3.47,1.37,5.8,5.8,0,0,1,1,3.87v1.43a21.6,21.6,0,0,0,.32,4.54,4.28,4.28,0,0,0,1.12,2.1h-5a5,5,0,0,1-.62-1.64,13.15,13.15,0,0,1-.19-2.5s0-.27,0-0.77,0-1,0-1.49q0-3.06-.84-4t-3.26-.94H70.57v11.33H66.35V105.78h0Zm4.21,3.47v8.12H77a6.72,6.72,0,0,0,4.1-1,3.7,3.7,0,0,0,1.38-3.15A3.36,3.36,0,0,0,81,110.28a6.84,6.84,0,0,0-4.05-1H70.57ZM104,105a14.29,14.29,0,0,1,5,.84,12.06,12.06,0,0,1,4,2.45,13,13,0,0,1,3.25,4.67,16.73,16.73,0,0,1,.06,11.68,13.22,13.22,0,0,1-2.9,4.56,12.12,12.12,0,0,1-4.18,2.77A14.14,14.14,0,0,1,104,133a13.83,13.83,0,0,1-5.24-1,12.3,12.3,0,0,1-4.27-2.85,13.13,13.13,0,0,1-2.84-4.49,15.87,15.87,0,0,1-.94-5.61,15.71,15.71,0,0,1,1-5.65,13.23,13.23,0,0,1,2.93-4.53A12.2,12.2,0,0,1,98.82,106,13.75,13.75,0,0,1,104,105Zm0,3.47a7.59,7.59,0,0,0-6.17,2.93,11.75,11.75,0,0,0-2.39,7.67,11.21,11.21,0,0,0,2.4,7.46,7.72,7.72,0,0,0,6.2,2.86,7.63,7.63,0,0,0,6.17-2.88,13.19,13.19,0,0,0,0-15.13A7.68,7.68,0,0,0,104,108.51Zm18.15-2.73h4.3v15.33q0,4.59,1.59,6.44t5.41,1.84q3.76,0,5.4-1.8t1.64-6.08V105.78h4.28v16.47q0,5.5-2.76,8.1t-8.56,2.6q-5.8,0-8.55-2.6t-2.75-8.11V105.78Zm52.36,8h-4.41a7.07,7.07,0,0,0-2.52-3.94,7.18,7.18,0,0,0-4.48-1.39,7.87,7.87,0,0,0-6.35,2.86,13.27,13.27,0,0,0,0,15.28,7.78,7.78,0,0,0,6.27,2.94,7,7,0,0,0,7.29-7.09h-4.66v-3h8.9v12.69h-3.15l-0.27-4.07a8.32,8.32,0,0,1-3.49,3.65,11.36,11.36,0,0,1-5.5,1.23,12.77,12.77,0,0,1-4.29-.71,10.53,10.53,0,0,1-3.53-2.07,13.58,13.58,0,0,1-3.53-4.92,16.64,16.64,0,0,1-.59-10.91,13.13,13.13,0,0,1,2-3.93,12.59,12.59,0,0,1,4.71-4.06,14.3,14.3,0,0,1,6.35-1.35,11.67,11.67,0,0,1,7.38,2.39A10.45,10.45,0,0,1,174.5,113.81Zm5.62-8h4.27v10.7h12.47v-10.7h4.25v26.4h-4.25V120H184.39v12.18h-4.27v-26.4Zm61.76,8h-4.7a6.71,6.71,0,0,0-2.41-3.8,7,7,0,0,0-4.37-1.36,8.1,8.1,0,0,0-6.45,2.88,11.15,11.15,0,0,0-2.48,7.53,10.86,10.86,0,0,0,2.48,7.42,8.17,8.17,0,0,0,6.45,2.83,7.23,7.23,0,0,0,4.77-1.56,6.15,6.15,0,0,0,2.19-4.21h4.74a10.47,10.47,0,0,1-3.91,6.9,13,13,0,0,1-8.2,2.49,12.65,12.65,0,0,1-9.64-3.86q-3.65-3.86-3.65-10.21a15.48,15.48,0,0,1,1-5.46,13.51,13.51,0,0,1,2.75-4.5,11.29,11.29,0,0,1,4.25-2.86,15,15,0,0,1,5.53-1,12.5,12.5,0,0,1,7.7,2.26A10.79,10.79,0,0,1,241.88,113.77Zm16.8-8.73a14.28,14.28,0,0,1,5,.84,12.06,12.06,0,0,1,4,2.45,13,13,0,0,1,3.25,4.67,16.72,16.72,0,0,1,.06,11.68,13.21,13.21,0,0,1-2.9,4.56,12.1,12.1,0,0,1-4.18,2.77,14.13,14.13,0,0,1-5.24.93,13.83,13.83,0,0,1-5.24-1,12.31,12.31,0,0,1-4.27-2.85,13.13,13.13,0,0,1-2.84-4.49,15.87,15.87,0,0,1-.94-5.61,15.71,15.71,0,0,1,1-5.65,13.23,13.23,0,0,1,2.93-4.53A12.22,12.22,0,0,1,253.5,106,13.75,13.75,0,0,1,258.67,105Zm0,3.47a7.59,7.59,0,0,0-6.16,2.93,11.75,11.75,0,0,0-2.39,7.67,11.21,11.21,0,0,0,2.4,7.46,7.72,7.72,0,0,0,6.2,2.86,7.63,7.63,0,0,0,6.17-2.88,13.18,13.18,0,0,0,0-15.13A7.68,7.68,0,0,0,258.67,108.51Zm18.15-2.73h4.3v15.33q0,4.59,1.59,6.44t5.4,1.84q3.76,0,5.4-1.8t1.64-6.08V105.78h4.28v16.47q0,5.5-2.76,8.1t-8.56,2.6q-5.8,0-8.55-2.6t-2.75-8.11V105.78h0Zm28.76,0H311l13.4,20.88,0.11-.11V105.78h4.23v26.4h-5.4L309.89,111l-0.2,0,0.11,21.13h-4.21v-26.4h0Zm53.1,8H354a6.71,6.71,0,0,0-2.41-3.8,7,7,0,0,0-4.36-1.36,8.1,8.1,0,0,0-6.45,2.88,11.15,11.15,0,0,0-2.48,7.53,10.86,10.86,0,0,0,2.48,7.42,8.17,8.17,0,0,0,6.45,2.83,7.23,7.23,0,0,0,4.77-1.56,6.15,6.15,0,0,0,2.19-4.21h4.74a10.47,10.47,0,0,1-3.91,6.9,13,13,0,0,1-8.2,2.49,12.65,12.65,0,0,1-9.64-3.86q-3.65-3.86-3.65-10.21a15.48,15.48,0,0,1,1-5.46,13.52,13.52,0,0,1,2.75-4.5,11.29,11.29,0,0,1,4.25-2.86,15,15,0,0,1,5.53-1,12.5,12.5,0,0,1,7.7,2.26A10.8,10.8,0,0,1,358.68,113.77Zm5-8h4.41v26.4h-4.41v-26.4Zm10.85,0h4.41v22.87h13.18v3.52H374.52V105.78ZM9.08,3.21h9.65V27.42H46.95V3.21h9.61V62.92H46.95V35.35H18.73V62.92H9.08V3.21Zm94.3,35.33V52.61a33.61,33.61,0,0,0,.43,5.62,21.73,21.73,0,0,0,1.33,4.68H95.86a24.19,24.19,0,0,1-.57-2.84Q95.08,58.62,95,57a20.62,20.62,0,0,1-6.58,5.71,16.92,16.92,0,0,1-7.89,1.82q-6.34,0-10.12-3.48a12,12,0,0,1-3.78-9.24,12.4,12.4,0,0,1,.78-4.48,10.17,10.17,0,0,1,2.33-3.58q3.23-3.19,14.8-4.37l2.17-.25q4.29-.45,6.09-1.7a4.17,4.17,0,0,0,1.8-3.66,4.56,4.56,0,0,0-2.21-3.95,10.44,10.44,0,0,0-5.93-1.49A11.27,11.27,0,0,0,80,30a6.67,6.67,0,0,0-2.94,4.64h-9a13.73,13.73,0,0,1,5.79-9.18q4.56-3,12.37-3,9.24,0,13.21,3.72T103.38,38.54Zm-8.63,2.25Q92.71,43,86,44.31l-2.17.45q-4.58,1-6.4,2.58a5.61,5.61,0,0,0-1.82,4.46,6.16,6.16,0,0,0,2,4.85,7.94,7.94,0,0,0,5.48,1.82q5.77,0,8.75-3.58t3-10.57q0-1-.16-3.27V40.79Zm47.32-18.4V31.1l-0.29,0q-2-.12-2.86-0.12-7,0-10.45,3.76T125,46.07V62.92h-8.79V24H125v7.77a18.46,18.46,0,0,1,6.65-7.09,18.63,18.63,0,0,1,9.51-2.27h0.9Zm33,0V31.1l-0.29,0q-2-.12-2.86-0.12-7,0-10.45,3.76T158,46.07V62.92h-8.79V24H158v7.77a18.46,18.46,0,0,1,6.65-7.09,18.63,18.63,0,0,1,9.51-2.27h0.9Zm23.07,0q9.41,0,15.07,5.77t5.66,15.33q0,9.45-5.68,15.23t-15,5.79q-9.45,0-15.11-5.75t-5.66-15.27q0-9.53,5.68-15.31T198.14,22.39Zm0,6.63a9.75,9.75,0,0,0-8.16,3.9q-3,3.91-3,10.65t3,10.49a10.66,10.66,0,0,0,16.36,0q3-3.82,3-10.49t-3-10.67A9.82,9.82,0,0,0,198.14,29Zm40,40a6.17,6.17,0,0,0,2.54,4.44,10.2,10.2,0,0,0,5.93,1.49q4.5,0,6.77-2.64t2.27-7.75v-7.2a15.14,15.14,0,0,1-5.6,5.48,16,16,0,0,1-7.77,1.8,15.33,15.33,0,0,1-12.39-5.93Q225,52.73,225,43.49t4.89-15.11a15.14,15.14,0,0,1,12.21-6,15.56,15.56,0,0,1,8.34,2.13,14,14,0,0,1,5.36,6.42l-0.16-7h8.87V63q0,9-4.89,13.6T245,81.15q-7.93,0-12.31-3.09a12.17,12.17,0,0,1-5-9.14Zm7-39.63a9.26,9.26,0,0,0-7.69,4q-3,4-3,10.39t3,10.28A9.37,9.37,0,0,0,245.25,58,9.07,9.07,0,0,0,252.88,54q2.92-3.95,2.92-10.37t-2.92-10.41A9.18,9.18,0,0,0,245.17,29.34Zm65.35,9.2V52.61a33.6,33.6,0,0,0,.43,5.62,21.68,21.68,0,0,0,1.33,4.68H303a24.18,24.18,0,0,1-.57-2.84q-0.21-1.45-.29-3.09a20.6,20.6,0,0,1-6.58,5.71,16.92,16.92,0,0,1-7.89,1.82q-6.34,0-10.12-3.48a12,12,0,0,1-3.78-9.24,12.42,12.42,0,0,1,.78-4.48,10.17,10.17,0,0,1,2.33-3.58q3.23-3.19,14.8-4.37l2.17-.25q4.29-.45,6.09-1.7a4.17,4.17,0,0,0,1.8-3.66,4.56,4.56,0,0,0-2.21-3.95,10.44,10.44,0,0,0-5.93-1.49A11.27,11.27,0,0,0,287.17,30a6.67,6.67,0,0,0-2.94,4.64h-9A13.73,13.73,0,0,1,281,25.44q4.56-3,12.37-3,9.24,0,13.21,3.72T310.52,38.54Zm-8.63,2.25q-2,2.21-8.71,3.52l-2.17.45q-4.58,1-6.4,2.58a5.61,5.61,0,0,0-1.82,4.46,6.17,6.17,0,0,0,2,4.85,7.94,7.94,0,0,0,5.48,1.82q5.77,0,8.75-3.58t3-10.57q0-1-.16-3.27V40.79h0Zm24.46-29.4h8.79V24h9.57v6.5h-9.57V48.93q0,5.44.94,6.91a3.76,3.76,0,0,0,3.44,1.47,8.56,8.56,0,0,0,2.06-.31,25.57,25.57,0,0,0,2.88-1v7A36.64,36.64,0,0,1,340,64.12a22.09,22.09,0,0,1-3.9.39q-5.52,0-7.63-2.62t-2.11-10.71V30.49h-5.52V24h5.52V11.39h0Zm66,34H360.62q0.33,6,3.62,9.32A11.92,11.92,0,0,0,373.09,58a11.71,11.71,0,0,0,6.09-1.55,10,10,0,0,0,4-4.37H392a17.19,17.19,0,0,1-6.81,9.14,20.39,20.39,0,0,1-11.63,3.25q-10.14,0-16-5.66t-5.85-15.36q0-9.41,5.7-15.25t15-5.85q9.45,0,14.68,5.6t5.23,15.83v1.59Zm-9.12-6a13,13,0,0,0-3.52-8.2,10.68,10.68,0,0,0-7.81-2.88,10.5,10.5,0,0,0-7.52,3,14.23,14.23,0,0,0-4,8.12h22.86Z" fill="#010101"></path><path d="M391.61,92.16c-20.74,4.32-75.5-.16-138.92-5.34C157.76,79.07,50.16,70.27,10.47,86.5l-0.31.13V99.7l0.68-.28C52.71,82.19,186,89.94,283.38,95.59c55.82,3.24,99.9,5.8,108.5,2.57l0.32-.12V92Z" fill="#1768b3"></path></svg>
-                        <span class="site-header__identity__heading visually-hidden">Harrogate Borough Council</span>
-                    </a>
-                </div>
-            </div>
-
-            <div class="site-header__toggles">
-                <a class="site-header__toggle site-header__toggle--menu icon icon-hamburger-menu2" href="#"><span class="visually-hidden">Menu</span></a>
-                <a class="site-header__toggle site-header__toggle--search icon icon-magnifying-glass-white" href="#"><span class="visually-hidden">Search</span></a>
-            </div>
-
-            <div class="site-header__right-info">
-                <div class="site-header__readspeak">
-                </div>
-                <div class="site-header__tasks site-header__tasks-nav">
-                <div class="site-header__right-one site-header__tasks__transactions">
-                    <ul class="site-header__links item-list item-list--inline">
-                        <li class="item-list__item"><a href="http://www.harrogate.gov.uk/events">What's on</a></li>
-                        <li class="item-list__item"><a href="http://www.harrogate.gov.uk/news">News</a></li>
-                        <li class="item-list__item"><a href="http://www.harrogate.gov.uk/site/scripts/az_index.php">A-Z</a></li>
-                        <li class="item-list__item"><a href="http://www.harrogate.gov.uk/site/scripts/user_settings.php">Accessibility</a></li>
-                        [%# <li class="item-list__item"><a href="https://my.harrogate.gov.uk/">Sign in/Register</a></li> %]
-                    </ul>
-                </div>
-                </div>
-                <div class="site-header__right-two">
-                    <ul class="site-header__links item-list item-list--inline">
-                        <li class="item-list__item"><a href="https://my.harrogate.gov.uk/MyServices"><i class="icon icon-arrow"></i> <span>Forms</span></a></li>
-                        <li class="item-list__item"><a href="https://www.harrogate.gov.uk/payments"><i class="icon icon-arrow"></i> <span>Payments</span></a></li>
-                        <li class="item-list__item"><a href="https://www.harrogate.gov.uk/a_to_z" class="show-hide-link" id="navigation"><i class="icon icon-hamburger-menu"></i> <span>Council services</span></a></li>
-                    </ul>
-                </div>
-            </div>
-            <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
-            <a href="#main-nav" id="nav-link">Main Navigation</a>
-        </div>
-        <div class="site-header__tasks__search-outer">
-            <div class="site-header__search">
-                <div class="container">
-                    <form class="site-header__tasks__search site-search form" action="http://www.harrogate.gov.uk/site/scripts/google_results.php" method="get">
-                        <div class="form__control form__control--append--wide">
-                            <label class="form__label" for="search-site">Keyword search</label>
-                            <div class="form__control--append__group">
-                                <input class="form__field" type="search" size="18" maxlength="40" name="q" placeholder="Keyword search e.g. council tax, planning permission..." id="search-site">
-                                <button class="button button--primary" type="submit"><span class="visually-hidden">Search</span> <i data-grunticon-embed="" class="icon icon-magnifying-glass"></i></button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <div class="site-header__tasks__fms-nav">
-          <div class="container">
-            [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--header' %]
-          </div>
-        </div>
-    </header>
\ No newline at end of file
diff --git a/templates/web/harrogate/main_menu.html b/templates/web/harrogate/main_menu.html
deleted file mode 100644
index 4e27c7a97..000000000
--- a/templates/web/harrogate/main_menu.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<ul class="nav-menu [% extra_class %]">
-    <li><[% IF c.req.uri.path == '/'
-        %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-        >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/my'
-        %]span[% ELSE %]a href="/my"[% END
-        %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/reports/Harrogate'
-        %]span[% ELSE %]a href="/reports/Harrogate"[% END
-        %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Harrogate' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/alert'
-        %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-        %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/faq'
-        %]span[% ELSE %]a href="/faq"[% END
-        %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-    %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-        %]span[% ELSE %]a href="/privacy"[% END
-        %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-</ul>
diff --git a/templates/web/harrogate/report/new/after_category.html b/templates/web/harrogate/report/new/after_category.html
deleted file mode 100644
index c00185d74..000000000
--- a/templates/web/harrogate/report/new/after_category.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<noscript>
-  <p class="nycc-notice">
-    Please report issues for categories labelled <b>(NYCC)</b> directly to
-    <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online">
-        North Yorkshire County Council.
-    </a>
-  </p>
-</noscript>
-
-<p class="nycc-notice" style="display:none">
-    Please report issues for <b>NYCC</b> managed categories directly to
-    <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online">
-        North Yorkshire County Council.
-    </a>
-</p>
-
-<p><small>[% loc("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.") %]</small></p>
diff --git a/templates/web/harrogate/report/new/councils_extra_text.html b/templates/web/harrogate/report/new/councils_extra_text.html
deleted file mode 100644
index 91cceca11..000000000
--- a/templates/web/harrogate/report/new/councils_extra_text.html
+++ /dev/null
@@ -1 +0,0 @@
-Do not use this to <a href="/faq#emergencies">report emergencies outside of working hours</a>. 
diff --git a/web/cobrands/harrogate/HBCLogo-cropped.png b/web/cobrands/harrogate/HBCLogo-cropped.png
deleted file mode 100755
index 4421820d2..000000000
Binary files a/web/cobrands/harrogate/HBCLogo-cropped.png and /dev/null differ
diff --git a/web/cobrands/harrogate/HBCLogo-mobile.png b/web/cobrands/harrogate/HBCLogo-mobile.png
deleted file mode 100755
index 7b4cd6063..000000000
Binary files a/web/cobrands/harrogate/HBCLogo-mobile.png and /dev/null differ
diff --git a/web/cobrands/harrogate/HBCLogo.png b/web/cobrands/harrogate/HBCLogo.png
deleted file mode 100644
index 11ee7c79c..000000000
Binary files a/web/cobrands/harrogate/HBCLogo.png and /dev/null differ
diff --git a/web/cobrands/harrogate/HBLogo.png b/web/cobrands/harrogate/HBLogo.png
deleted file mode 100755
index 03cf2b4f5..000000000
Binary files a/web/cobrands/harrogate/HBLogo.png and /dev/null differ
diff --git a/web/cobrands/harrogate/_colours.scss b/web/cobrands/harrogate/_colours.scss
deleted file mode 100644
index 08909befe..000000000
--- a/web/cobrands/harrogate/_colours.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/* COLOURS */
-
-$menu-image: 'menu-black';
-
-$harrogate_blue: #0067b9;
-$harrogate_yellow: #f1c400;
-
-$primary: $harrogate_blue;
-$primary_dark: darken($harrogate_blue, 20%);
-
-$col_click_map: $harrogate_blue;
-$col_fixed_label_dark: $harrogate_blue;
-$col_fixed_label: $harrogate_blue;
-
-$primary_b: #000000;
-$primary_text: #ffffff;
-
-$base_bg: #fff;
-$base_fg: #1a1a1a;
-
-/* Following seem to be required in layout.scss */
-$map_nav_bg: white;
-$nav_fg: #000;
-$nav_fg_hover: #444;
diff --git a/web/cobrands/harrogate/_fonts.scss b/web/cobrands/harrogate/_fonts.scss
deleted file mode 100644
index edacfe25b..000000000
--- a/web/cobrands/harrogate/_fonts.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import url("//fonts.googleapis.com/css?family=Montserrat:400,700");
-
-$heading-font: 'Montserrat', sans-serif;
-$body-font: $heading-font;
-$meta-font: $heading-font;
diff --git a/web/cobrands/harrogate/_harrogate_header.scss b/web/cobrands/harrogate/_harrogate_header.scss
deleted file mode 100644
index a5e0deca3..000000000
--- a/web/cobrands/harrogate/_harrogate_header.scss
+++ /dev/null
@@ -1,159 +0,0 @@
-// Styles specific to Harrogate's standard header, all of which are taken from their CSS files.
-// If you need to override anything in here, do it in _harrogate_header_overrides.scss instead.
-header.site-header {
-  article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; }
-  a { background-color: transparent; }
-  h1, .h1, .site-header__identity__heading { font-size: 2em; margin: 0.67em 0px; }
-  svg:not(:root) { overflow: hidden; }
-  button, input, optgroup, select, textarea { color: inherit; font-style: inherit; font-variant: inherit; font-weight: inherit; font-stretch: inherit; font-size: inherit; line-height: inherit; font-family: inherit; margin: 0px; }
-  button { overflow: visible; }
-  button, select { text-transform: none; }
-  button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; cursor: pointer; }
-  input { line-height: normal; }
-  input[type="search"] { -webkit-appearance: textfield; box-sizing: content-box; }
-  .visually-hidden, .nav--breadcrumb__prefix, .skip-links__link:not(:hover):not(:active):not(:focus), .back-to-top__link:not(:hover):not(:active):not(:focus), .form__control--append--full .form__label, .widget--in-my-area form .form__label, .site-search .form__label, .site-footer__useful-links .site-footer__heading, .site-footer__suppliers .site-footer__heading { border: 0px; clip: rect(0px 0px 0px 0px); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; }
-  blockquote, dl, dd, ol, ul, h1, .h1, .site-header__identity__heading, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6, p, pre, fieldset, hr { margin: 0px; }
-  fieldset, ol, ul { padding: 0px; }
-  hgroup, .hgroup, ul, ol, dl, blockquote, p, pre, address, table, form, hr { margin: 0.75em 0px 1.5em; }
-  ul, ol, dd { margin-left: 24px; }
-  .alpha, h1, .h1, .site-header__identity__heading { font-size: 2.5em; line-height: 1.2em; margin: 0.9em 0px 0px; }
-  .button, .button:visited, form:not([class]) input[type="button"], form:not([class]) input[type="submit"], .form__field, .form__select, form:not([class]) select, .form__textarea, form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) textarea, .widget--directory-search .field, .data-table th, .page-content table:not([class]) th, .data-table td, .page-content table:not([class]) td, .help, .normalis, h6, .h6 { font-size: 1em; line-height: 1.5em; margin: 0.75em 0px 0px; }
-  h1, .h1, .site-header__identity__heading, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 { color: rgb(0, 0, 0); font-weight: 600; line-height: 1.2; }
-  .h1, .site-header__identity__heading { display: block; }
-  .boxed, .alert, .callout, .form, form:not([class]), .item-list--gallery, .widget--directory-search, .widget--documents, .widget--events-calendar, .widget--image, .widget--latest-news, .widget--middle-adverts div, .widget--multimedia, .widget--navigation, .widget--opinion-poll, .widget--right-adverts div, .widget--sub-category-links, .widget--top-faqs, .widget--what-s-new-on-site, .widget--what-s-on, .supplement--advert, .supplement--contact, .supplement--image, .supplement--navigation { border: 1px solid rgb(213, 222, 226); box-shadow: none; margin: 1.5em 0px 3em; padding: 1.5em 1.5rem; }
-  .icon { background-position: center center; background-size: 100%; display: inline-block; fill: currentcolor; height: 2rem; vertical-align: middle; width: 2rem; }
-  a { color: rgb(0, 103, 185); text-decoration: none; transition: background-color 0.6s, color 0.6s; }
-  .button, .button:visited, form:not([class]) input[type="button"], form:not([class]) input[type="submit"], form:not([class]) input[type="button"]:visited, form:not([class]) input[type="submit"]:visited { background-color: rgb(255, 255, 255); border: 0.075em solid rgb(84, 110, 122); color: rgb(84, 110, 122); cursor: pointer; display: inline-block; font-family: Montserrat, sans-serif; margin: 0px 0px 0.75rem; padding: 0.6975em 0.75rem; text-align: center; text-decoration: none; vertical-align: top; white-space: normal; width: 100%; }
-  .button--primary, .button--primary:visited, .widget--directory-search .button, .widget--opinion-poll .button, .widget--directory-search .button:visited, .widget--opinion-poll .button:visited, .editor .button, .editor .button:visited, .button--standout, .button--standout:visited { background-color: rgb(225, 6, 0); border-color: rgb(225, 6, 0); color: rgb(255, 255, 255); transition: background-color 0.6s; }
-  .form, form:not([class]) { margin-bottom: 1.5em; }
-  .form input[type="search"], form:not([class]) input[type="search"] { -webkit-appearance: none; box-sizing: border-box; }
-  .form .button, form:not([class]) .button { margin-top: 0.75em; }
-  .form__label, .form__field, .form__select, form:not([class]) select, .form__textarea, form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) textarea, .form__select, form:not([class]) select, .form__textarea, .widget--directory-search .field { display: block; }
-  .form__control { margin: 2.25em 0px; }
-  .form__control--append__group { height: calc(0.7125em + 24px); margin-top: 0.75em; position: relative; }
-  .form__control--append__group .form__field, .form__control--append__group .form__select, .form__control--append__group form:not([class]) select, form:not([class]) .form__control--append__group select, .form__control--append__group .form__textarea, .form__control--append__group form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) .form__control--append__group input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), .form__control--append__group form:not([class]) textarea, form:not([class]) .form__control--append__group textarea, .form__control--append__group .button { margin-top: 0px; }
-  .form__control--append__group .form__field, .form__control--append__group .form__select, .form__control--append__group form:not([class]) select, form:not([class]) .form__control--append__group select, .form__control--append__group .form__textarea, .form__control--append__group form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) .form__control--append__group input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), .form__control--append__group form:not([class]) textarea, form:not([class]) .form__control--append__group textarea { height: 100%; left: 0px; padding-right: calc(0.75rem + 32.2034%); position: absolute; top: 0px; width: 100%; }
-  .form__control--append__group .button { height: 100%; position: absolute; right: 0px; top: 0px; width: 32.2034%; }
-  .form__label { margin-top: 0.75em; padding: 0px; width: 100%; }
-  .form__field, .form__select, form:not([class]) select, .form__textarea, form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) textarea, .widget--directory-search .field { background-color: rgb(255, 255, 255); border: 0.075em solid rgb(183, 198, 205); border-radius: 0px; color: rgb(55, 71, 79); font-family: Montserrat, sans-serif; height: 3rem; margin-top: 0.75em; max-width: 30rem; padding: 0.3em 0.75rem; width: 100%; }
-  .item-list { list-style: none; margin-left: 0px; }
-  .item-list--inline { margin-top: 0.375em; padding-left: 4px; }
-  .item-list--inline .item-list__item, .item-list--inline li { display: inline-block; margin: 0.375em 1.5rem 0px -4px; white-space: nowrap; }
-  .item-list--inline .item-list__item:last-child, .item-list--inline li:last-child { margin-right: 0px; }
-  .site-header__identity { width: 66.1017%; float: left; margin-right: 1.69492%; }
-  .site-header__identity__logo svg { max-height: 100%; max-width: 100%; }
-  .site-header__identity__logo a { display: block; float: left; height: 50px; margin-bottom: 0.5rem; text-decoration: none; width: 150px; }
-  .site-header__identity__heading { font-size: 1.625rem; line-height: 1.1em; margin: 0px; text-align: left; width: 200px; }
-  .site-header__right-info { width: 100%; float: right; margin-right: 0px; }
-  .site-header__readspeak { display: none; float: right; margin-bottom: 0.75rem; width: 100%; }
-  .site-header__right-one { float: right; width: 100%; }
-  .site-header__right-one .site-header__links { margin: 0px; text-align: right; width: 100%; }
-  .site-header__right-one .site-header__links .item-list__item { margin-bottom: 0px; margin-right: 0px; margin-top: 0px; }
-  .site-header__right-one .site-header__links .item-list__item a { color: rgb(0, 0, 0); }
-  .site-header__right-two { border-bottom: 1px solid rgb(0, 0, 0); border-top: 1px solid rgb(0, 0, 0); float: right; margin-bottom: 1.5rem; margin-top: 0.75rem; padding-bottom: 0.375rem; padding-top: 0.5rem; width: 100%; }
-  .site-header__right-two .site-header__links { float: left; margin-bottom: 0px; margin-top: 0px; padding-left: 0px; text-align: left; width: 100%; }
-  .site-header__right-two .site-header__links li { margin-right: 0px; margin-top: 0px; width: auto; }
-  .site-header__right-two .site-header__links li:last-child { float: right; }
-  .site-header__right-two .site-header__links li:nth-child(2) { margin-right: 2rem; }
-  .site-header__right-two .site-header__links li a { color: rgb(0, 0, 0); font-size: 1.125rem; font-weight: bold; margin-top: 0px; transition: 0.6s; }
-  .site-header__right-two .site-header__links li i { background-size: 30%; margin-top: -3px; }
-  .site-header__right-two .site-header__links li span { margin-left: -0.5rem; }
-  .site-header__toggles { position: absolute; right: 0px; top: 0px; }
-  .site-header__toggle { background-position: center center; display: block; font-size: 1.625rem; height: 3.75rem; overflow: hidden; padding: 0px; position: absolute; text-align: center; text-decoration: none; width: 3.75rem; z-index: 4; transition: transform 200ms ease-in-out !important; }
-  .site-header__toggle--menu { background-color: rgb(0, 0, 0); background-size: 95%; margin-bottom: 0.375rem; right: 0px; top: 0px; transition: background 0.3s, color 0.3s; }
-  .site-header__toggle--search { background-color: rgb(0, 103, 185); background-size: 60%; right: 51px; top: 0px; }
-  .show-hide-link { color: rgb(0, 0, 0); display: block; font-size: 1.125rem; font-weight: bold; opacity: 1; position: relative; text-align: center; text-decoration: none; }
-  .show-hide-link em { display: none; font-style: normal; }
-  .show-hide-link i { margin-right: 0.75rem; margin-top: -3px; }
-  .site-header__right-two .site-header__links li .show-hide-link i { background-size: 100%; padding-right: 0.5em; }
-  .site-header__council-nav { width: 38.9831%; }
-  .site-header__council-nav .services-menu__list-container { display: none; }
-  .site-header__council-nav.services-menu { background-color: rgb(0, 0, 0); width: 100%; }
-  .site-header__council-nav.services-menu .item-list { background-color: rgb(0, 0, 0); margin: 0px; padding: 1.5rem !important; }
-  .site-header__council-nav.services-menu .item-list .item-list__item { list-style-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAICAYAAADeM14FAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsSAAALEgHS3X78AAAALUlEQVQI163GwQ0AEAAEwaM7+i9BKGN8ePibZJMNGuap5cw1a14l6FgY6PlgAz0JLGdfkztJAAAAAElFTkSuQmCC"); padding: 0.375rem; width: 100%; }
-  .site-header__council-nav.services-menu .item-list .item-list__item a { color: rgb(255, 255, 255); }
-  .site-header__council-nav.services-menu .container, .site-header__council-nav.services-menu .item-list { position: relative; }
-  .site-header__search { background-color: rgb(0, 103, 185); }
-  .site-header__search .site-search { margin: 4.5rem 0px 0px; padding: 0.75rem 0px; width: 100%; }
-  .site-header__search .site-search .form__control { height: 3.5rem; margin: 0px auto; width: 100%; }
-  .site-header__search .site-search .form__control--append__group { height: calc(1.5rem + 24px); }
-  .site-header__search .site-search .form__field, .site-header__search .site-search .form__select, .site-header__search .site-search form:not([class]) select, form:not([class]) .site-header__search .site-search select, .site-header__search .site-search .form__textarea, .site-header__search .site-search form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) .site-header__search .site-search input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), .site-header__search .site-search form:not([class]) textarea, form:not([class]) .site-header__search .site-search textarea { border: 0px; color: rgb(98, 99, 99); font-size: 0.875rem; height: 3.5rem; max-width: 100%; padding-left: 1.125rem; padding-right: 3rem; }
-  .site-header__search .site-search .button { background-color: rgb(255, 255, 255); border: 0px; border-radius: 0px; height: 3.5rem; padding: 0px; width: 3rem; }
-  .site-header__search .site-search .button i { background-size: 90%; margin-top: -0.375rem; transition: 0.6s; }
-  .container, .site-header__council-nav.services-menu .item-list { max-width: 1280px; margin-left: auto; margin-right: auto; padding: 0px 1.125rem; }
-  .boxed, .alert, .callout, .form, form:not([class]), .item-list--gallery, .widget--directory-search, .widget--documents, .widget--events-calendar, .widget--image, .widget--latest-news, .widget--middle-adverts div, .widget--multimedia, .widget--navigation, .widget--opinion-poll, .widget--right-adverts div, .widget--sub-category-links, .widget--top-faqs, .widget--what-s-new-on-site, .widget--what-s-on, .supplement--advert, .supplement--contact, .supplement--image, .supplement--navigation { padding-top: 1.35em; }
-  .site-search { background-color: transparent; border: 0px; box-shadow: none; padding-top: 0px; }
-  .site-search .form__control--append__group { margin-top: 0px; }
-  .module > :last-child, .module > :last-child > :last-child, .module > :last-child > :last-child > :last-child, .module > :last-child > :last-child > :last-child > :last-child, .boxed > :last-child, .alert > :last-child, .callout > :last-child, .form > :last-child, form:not([class]) > :last-child, .item-list--gallery > :last-child, .widget--directory-search > :last-child, .widget--documents > :last-child, .widget--events-calendar > :last-child, .widget--image > :last-child, .widget--latest-news > :last-child, .widget--middle-adverts div > :last-child, .widget--multimedia > :last-child, .widget--navigation > :last-child, .widget--opinion-poll > :last-child, .widget--right-adverts div > :last-child, .widget--sub-category-links > :last-child, .widget--top-faqs > :last-child, .widget--what-s-new-on-site > :last-child, .widget--what-s-on > :last-child, .supplement--advert > :last-child, .supplement--contact > :last-child, .supplement--image > :last-child, .supplement--navigation > :last-child, .image--caption > :last-child, .editor .imageCaption > :last-child, .site-footer > :last-child, .sidebar > :last-child, .widget > :last-child, .boxed > :last-child > :last-child, .alert > :last-child > :last-child, .callout > :last-child > :last-child, .form > :last-child > :last-child, form:not([class]) > :last-child > :last-child, .item-list--gallery > :last-child > :last-child, .widget--directory-search > :last-child > :last-child, .widget--documents > :last-child > :last-child, .widget--events-calendar > :last-child > :last-child, .widget--image > :last-child > :last-child, .widget--latest-news > :last-child > :last-child, .widget--middle-adverts div > :last-child > :last-child, .widget--multimedia > :last-child > :last-child, .widget--navigation > :last-child > :last-child, .widget--opinion-poll > :last-child > :last-child, .widget--right-adverts div > :last-child > :last-child, .widget--sub-category-links > :last-child > :last-child, .widget--top-faqs > :last-child > :last-child, .widget--what-s-new-on-site > :last-child > :last-child, .widget--what-s-on > :last-child > :last-child, .supplement--advert > :last-child > :last-child, .supplement--contact > :last-child > :last-child, .supplement--image > :last-child > :last-child, .supplement--navigation > :last-child > :last-child, .image--caption > :last-child > :last-child, .editor .imageCaption > :last-child > :last-child, .site-footer > :last-child > :last-child, .sidebar > :last-child > :last-child, .widget > :last-child > :last-child, .boxed > :last-child > :last-child > :last-child, .alert > :last-child > :last-child > :last-child, .callout > :last-child > :last-child > :last-child, .form > :last-child > :last-child > :last-child, form:not([class]) > :last-child > :last-child > :last-child, .item-list--gallery > :last-child > :last-child > :last-child, .widget--directory-search > :last-child > :last-child > :last-child, .widget--documents > :last-child > :last-child > :last-child, .widget--events-calendar > :last-child > :last-child > :last-child, .widget--image > :last-child > :last-child > :last-child, .widget--latest-news > :last-child > :last-child > :last-child, .widget--middle-adverts div > :last-child > :last-child > :last-child, .widget--multimedia > :last-child > :last-child > :last-child, .widget--navigation > :last-child > :last-child > :last-child, .widget--opinion-poll > :last-child > :last-child > :last-child, .widget--right-adverts div > :last-child > :last-child > :last-child, .widget--sub-category-links > :last-child > :last-child > :last-child, .widget--top-faqs > :last-child > :last-child > :last-child, .widget--what-s-new-on-site > :last-child > :last-child > :last-child, .widget--what-s-on > :last-child > :last-child > :last-child, .supplement--advert > :last-child > :last-child > :last-child, .supplement--contact > :last-child > :last-child > :last-child, .supplement--image > :last-child > :last-child > :last-child, .supplement--navigation > :last-child > :last-child > :last-child, .image--caption > :last-child > :last-child > :last-child, .editor .imageCaption > :last-child > :last-child > :last-child, .site-footer > :last-child > :last-child > :last-child, .sidebar > :last-child > :last-child > :last-child, .widget > :last-child > :last-child > :last-child, .boxed > :last-child > :last-child > :last-child > :last-child, .alert > :last-child > :last-child > :last-child > :last-child, .callout > :last-child > :last-child > :last-child > :last-child, .form > :last-child > :last-child > :last-child > :last-child, form:not([class]) > :last-child > :last-child > :last-child > :last-child, .item-list--gallery > :last-child > :last-child > :last-child > :last-child, .widget--directory-search > :last-child > :last-child > :last-child > :last-child, .widget--documents > :last-child > :last-child > :last-child > :last-child, .widget--events-calendar > :last-child > :last-child > :last-child > :last-child, .widget--image > :last-child > :last-child > :last-child > :last-child, .widget--latest-news > :last-child > :last-child > :last-child > :last-child, .widget--middle-adverts div > :last-child > :last-child > :last-child > :last-child, .widget--multimedia > :last-child > :last-child > :last-child > :last-child, .widget--navigation > :last-child > :last-child > :last-child > :last-child, .widget--opinion-poll > :last-child > :last-child > :last-child > :last-child, .widget--right-adverts div > :last-child > :last-child > :last-child > :last-child, .widget--sub-category-links > :last-child > :last-child > :last-child > :last-child, .widget--top-faqs > :last-child > :last-child > :last-child > :last-child, .widget--what-s-new-on-site > :last-child > :last-child > :last-child > :last-child, .widget--what-s-on > :last-child > :last-child > :last-child > :last-child, .supplement--advert > :last-child > :last-child > :last-child > :last-child, .supplement--contact > :last-child > :last-child > :last-child > :last-child, .supplement--image > :last-child > :last-child > :last-child > :last-child, .supplement--navigation > :last-child > :last-child > :last-child > :last-child, .image--caption > :last-child > :last-child > :last-child > :last-child, .editor .imageCaption > :last-child > :last-child > :last-child > :last-child, .site-footer > :last-child > :last-child > :last-child > :last-child, .sidebar > :last-child > :last-child > :last-child > :last-child, .widget > :last-child > :last-child > :last-child > :last-child { margin-bottom: 0px; }
-}
-
-
-@media screen and (min-width: 600px) {
-  header.site-header {
-    .site-header__identity__logo {
-      a, svg {
-        height: 70px;
-        width: 200px;
-      }
-    }
-  }
-}
-
-@media screen and (min-width: 760px) {
-  header.site-header {
-    .site-header__toggles {
-        display: none;
-    }
-    .site-header__identity {
-        width: 32.2033898305%;
-        float: left;
-        margin-right: 1.6949152542%;
-    }
-    .site-header__right-info {
-        width: 66.1016949153%;
-        float: right;
-        margin-right: 0;
-    }
-	.site-header__search .site-search .form__control {
-	    width: 65.2542372881%;
-	}
-  }
-}
-
-@media screen and (min-width: 960px) {
-  header.site-header {
-    .site-header__identity {
-        width: 40.6779661017%;
-        float: left;
-        margin-right: 1.6949152542%;
-    }
-    .site-header__right-info {
-        width: 57.6271186441%;
-        float: right;
-        margin-right: 0;
-    }
-    .site-header__identity__logo {
-      a, svg {
-        height: 130px;
-        width: 300px;
-      }
-    }
-	.site-header__search .site-search .form__field, .site-header__search .site-search .form__select, .site-header__search .site-search form:not([class]) select, form:not([class]) .site-header__search .site-search select, .site-header__search .site-search .form__textarea, .site-header__search .site-search form:not([class]) input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), form:not([class]) .site-header__search .site-search input:not([type="button"]):not([type="checkbox"]):not([type="radio"]):not([type="submit"]), .site-header__search .site-search form:not([class]) textarea, form:not([class]) .site-header__search .site-search textarea {
-		font-size: 1.25rem;
-	}
-	.site-header__right-two .site-header__links li .show-hide-link i {
-		background-size: 77%;
-	}
-  }
-}
-
-@media screen and (min-width: 1280px) {
-  header.site-header {
-    .site-header__right-two .site-header__links li a {
-      font-size: 1.875rem;
-    }
-	.site-header__right-two .site-header__links li i {
-	    background-size: 47%;
-	}
-  }
-}
diff --git a/web/cobrands/harrogate/_harrogate_header_overrides.scss b/web/cobrands/harrogate/_harrogate_header_overrides.scss
deleted file mode 100644
index 6db198dcb..000000000
--- a/web/cobrands/harrogate/_harrogate_header_overrides.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-// Custom rules required to make the Harrogate header look right within FMS.
-
-#site-header {
-  .site-header__right-info, .main-menu, .site-header__tasks__search-outer, .visually-hidden {
-    display: block;
-  }
-}
-
-#site-header {
-   .item-list {
-    border: none;
-  }
-
-  .item-list__item {
-    background-color: transparent;
-  }
-
-  .site-header__right-two {
-      border: 0;
-      padding-bottom: 0;
-      padding-top: 0;
-  }
-
-  .show-hide-link em {
-    display: inline;
-  }
-
-  .site-header__links.item-list.item-list--inline {
-    text-align: right;
-    li {
-      float: none;
-      margin-right: 0;
-    }
-  }
-}
-
-::-webkit-input-placeholder {
-  color: #666666;
-  font: {
-    style:normal;
-    size:0.9375em;
-  }
-}
-:-moz-placeholder {
-  color:#666666;
-  font: {
-    style:normal;
-    size:0.9375em;
-  }
-}
-:-ms-placeholder {
-  color:#666666;
-  font: {
-    style:normal;
-    size:0.9375em;
-  }
-}
-//this only gets used when the browser doesn't support @placeholder
-.placeholder {
-  color:#666666;
-  font: {
-    style:normal;
-    size:0.9375em;
-  }
-}
diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss
deleted file mode 100644
index 3a2f039a8..000000000
--- a/web/cobrands/harrogate/base.scss
+++ /dev/null
@@ -1,93 +0,0 @@
-@import "../sass/h5bp";
-@import "./_colours";
-@import "../sass/mixins";
-@import "./_fonts";
-
-@import "../sass/base";
-
-// Hide the standard Harrogate header nav
-#site-header {
-  .site-header__toggles, .site-header__right-info, .main-menu, .site-header__tasks__search-outer, .visually-hidden, .site-header__tasks__fms-nav {
-    display: none;
-  }
-}
-
-header.site-header {
-  .site-header__identity__logo svg {
-      height: 50px;
-      width: 100px;
-  }
-}
-
-#report-cta {
-    border-color: #ddd;
-    color: #000;
-
-    &:hover, &:focus {
-      background-color: #eee;
-    }
-}
-
-.nav-menu--main {
-    // blue button background, darker if selected
-    a {
-        background: #ededed;
-    }
-    span {
-        color: #fff;
-        background: $primary;
-    }
-}
-
-label[for=form_INFO_TEXT] {
-    background: yellow;
-    border: solid 1px black;
-    padding: 1em;
-}
-
-#site-header {
-    background: none;
-}
-
-
-#council_responsibilities_note {
-    background-color: $harrogate_blue;
-    color: white;
-    padding: 0.5em;
-    font-size: 0.8em;
-    a {
-      color: white;
-      text-decoration: underline;
-    }
-}
-
-.nycc-notice {
-    border: solid 1px black;
-    background: #00539F;
-    color: white;
-    padding: 0.5em;
-    margin-top: 1em;
-    a {
-        color: white;
-        text-decoration: underline;
-    }
-}
-
-a.platform-logo {
-    vertical-align: baseline;
-    display: inline-block;
-    background-position: top left;
-    background-repeat: no-repeat;
-    background-size: auto 1.5em;
-    background-image: url(/cobrands/fixmystreet/images/fms-platform-logo.svg);
-    text-indent: -1000%;
-    height: 1.7em;
-    width: 16em;
-    padding-#{$right}: 0.25em;
-}
-
-footer {
-  background-color: black;
-  color: white;
-}
-
diff --git a/web/cobrands/harrogate/icons/icons.data.png.css b/web/cobrands/harrogate/icons/icons.data.png.css
deleted file mode 100644
index ae2a1813d..000000000
--- a/web/cobrands/harrogate/icons/icons.data.png.css
+++ /dev/null
@@ -1,157 +0,0 @@
-.icon-arrow-down-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAASCAYAAABM8m7ZAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVtJREFUSIm107ErRWEYBvD3nHvlDldKiihFShmsjDKYTLq7DP4B2WwWu4jdIpkkk5LhrmS7sigZkMJyE8/zGJyrr5tzvu9e97zz+7y/3u89JwKwbWazll4vURRV4jh+zugxMzNJZZKHZjaS0VYrFAoVA3AmTwE4l9TlQSMARwGzrs3MjOQAgLuAwFYWTHI9YMYjyVE3NCnp1RckuZyCLgCgB62TnP4rPAfg0xP+aA6TnADw5smR5GLWcy35tgbwIGkwuWsvgJovQ3I160xmZgZgIwCvSioBOA7o3ZEUeWH9fJ37AQNvAnpOJBW9qPPk3QAufIM96KWkcjDq4H0h90tB70kOtYw2StIYgKcW0XeSU22jzuYzAOqB6BfJ+X+jDl4JgUmudAx18DXPtpsdR81+f7PdFPRAUpwLnOBFAKdNaFVSKTe0USR7AFwl6K2k/txRBx8GsEdyvN0Z3xs/89W6+xu4AAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-arrow-down { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAASCAYAAABM8m7ZAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAASZJREFUSIm91LErxGEcx/HXiRhISRGlSCmDlVEGk0m3y+AfkM1msYvYLZJJMikZrGQji5IBKSwSHcPvnpLu7nnu3HnXs30/n/fv1+/5/nJYx6TyPCGPxwozgXbsYqDCzGWxzxG+IucYLRFpDnsJXRch0IObhMBaRLyc0HGPwZ+hUTwnBOfLSGdQiGTfMF4qPIWPSPi9RHgEL5FcAbNlHhrMJbz1HXqL852yyxLLLFaSBlYSik7Rhv2E2Q3ZxYuSw3ZC4VXCzAGaU6SBVpwkFFc6Z7K9rpouad+v1LlFXy3SwBAeqpS+Yuwv0sCEbAdTpJ+Yroc0kE8UL9RTGliKSFcbISVbs80y0h00NUpMtpOHv6ThZ9JwOnBelF6j+z+kgX5sYbjWgm+TAd/mkTb9lgAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-arrow-left-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAYAAAAhDE4sAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAXZJREFUSIml1TtLA0EUBeCdwQcBES0sFbWxEUSwMAhpVPAfWNjZCFaWFpY2/gYRkRSCNtoEVIQgipVNIJV2goiYQmyE5JxjkRU12cdN9pTL5duZO5cZF2QIyRlJZ0EQlLIgKwA+1Uy5W2QDQEO/6QyS5AHsqT12iGRO0kkEIknlHiMyIuncOZePq0mFSE5JKnnvJ5PqfApSkHSfhiRCJNckXXnvh9MQks9tHyU5kjsxTW0LgAOS/a1IH4BDI1AnuSnJtSJDAK6NyBvJQtR2xgFUjciDpLGoRs0BeDUiRZK5yI4DuDAiN5Lix4XkLIAXI3YqaSAJGwVQMWIVkhNJ2GAH26yRXIzFJPUC2DdiDZJbap2jP5iTtG3BQvAo9iTDra4C+DJixVgoxBYAvBuscuI14r2/c87Nk3xM/GOQch+F2JNzLk/yNhMUYjXv/TLJY0t9atR8RXajetQVSHIdQD0zFK5uCcDHDxQ9lfaVTav59l9mcf7lG83qWVJkAssNAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-arrow-left { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAYAAAAhDE4sAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAS1JREFUSImt1L8rxGEcwPHXOT9LUjISJRYlZVMWBv+BwWZRJqPBP+AfsEjSlYHBbFAXJYvlyiIGiySULOTqDF907r73ved7d+8/4PV9nuf7fJ6s5prCJcabQRbxjhLyjSKrKP4gDUFt2CoDGoJ6cBiDpIIGcVEDCYYmcJeABEFzeK2D1IWW8RmAlJCLAzLYDARK2EVXJdKJvUDgC2s/H/5XP04DkSfR+VU1gutA5ArDccgMHgORnOhixnYSiJyJRqRm03gIxI7Qm4QNoRCIFTCahPWl2OYL5pOwDuwEYkWsi7lHv2WwEYiVsC/hT8ISPgKx2FkrbxbPAVC+HgRjuGkFBAM4bwUE3TioBWVTQEUco1315N+nWVF5K6L3qKGtVbaAt1ZAMIlbbDcL/fUNLnrnw61SPdgAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-arrow-up-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAASCAYAAABM8m7ZAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVtJREFUSIm11L9LHFEUxfE7z1+IxZImBCEWQQhaCUIgpEkdsbZLZSEhhaVg4R9gYWcjNtZbSEKaNBY2QmwkRawMVsKyIEEEEb7n2OzCEHZnn6N763vO5zFvZiJqjKR54Jukd3Xytcb2K+DStoGW7TdDRyVNAb9cGuCP7RdDQ22PAIfuMcCR7fGhwMBOL7SEH9gunhWV9LUK7Y6kredElwFy4A7++cmo7UXgNhftPPJ72x+fgs4AV49BS/i1pLk6aAP4XQct4ReSXj4GHQN+ZhQfZ+ycSJrMQQtgL6Pwu+0E7GfsNm2nQfBGRtG57UZEhKQJ4CQjs90XlbSSUfBP0tv/ctM5L6GktV7oB+BuACpJS30O/b7zGVXlkfSpHJoF2hkn3qy6JkmrgzqAG9sL3Xs9zQg0nfEfBnYzuv5GRIxK+hER7Yq+VkrpS1EUHgSnlNYljUXE64q1s4iIB4r49n8Vr7wtAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-arrow-up { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAASCAYAAABM8m7ZAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAASZJREFUSIm91L8rRXEcxvHX9TMZZJEUg5SYlFKymMlsMxkkg1EZ/AEGm0UW8x1EFovBolhkYCKTuilJSuq6hntO6eac873HvZ56ts/zvL/fvj/Ip3EcYSpnPpf68YgKShj+D2g3LiNo7Fv0NhPaisMaaOwzdDQLvJMAjX2AQqOhaxnQ2FuNhC6gHAiuYKkR0Em81wGt4BOzf4EO4alOaOwXjOWB9uAmJzT2PfrqgbbjNKD4PGDmAl0h0AL2AgqP0YL9gNliNJuqjYCiO9WjgM5oV1mZ7TToYkDBK0ZrcgPCLuHKb9AZfGQEvzCfsOhp1WeUli9j7mdoBM8BK95MgMZaDuh4w0QcuAoIFIX9w7sBXQ/QhpNox0kqYTUKZWld9TkOpsxcwzeBNeKByddSTQAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-arrow-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAYAAAAhDE4sAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAXJJREFUSImt1L1LHFEYxeGZG8lHEdkmKcIWYiUWUbBRSKoUYdOkSGcf2D8gnYWFhUXAVmzEOlhYbbWQYkE39mk2aJ0PbLSSeH7HZiLLMnPnupO3GpjLw3vPhZNJ2pI0tD2fNRlJfduW9BtYndYJdx8hPLP9FfjQaKN/Iwngk+28ETQG7tqeaQwVWA94muKE6M8QOrYHQLsRVGBLtr/ZXq6D/iRgL4AB0Kk8BMxKOqrKaSKzG6BbidkOwGYKVoCfbVfHAryXdJWIHQJPYtiipFEiNgSex67aktRLxM5tL8SwB5JOUq9ZhTy2fZCI/LS9UpZRW9JpIvLd9lzZJq8k/UpE+rZbZZt0Jf1NRPZtP5wEHknaSwFsG9hwWVc5PdRrYL3ymWN9NIZcAK8rkSzLahsQOMvz/F0IYRQ7F+0j4DjP87U6JAoBX0IIb0IItX2VZVl5RpK2HauJOqgoro/3AiYhSZfA26mQAtqR9AN4OTXyP+cWfqhlTHpQDw0AAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-arrow { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAeCAYAAAAhDE4sAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAARtJREFUSImt1L0rhWEYB+CLUyeRYmKTjU2JmVUpm4XdoPwFjEZlNFlNstiORRmwnpLppJRMJ4OPjngN5yid3o/7zfurZ3rqej7vG5poYNw/k/TGHaargBI8Y7EKKMEb1qqAEnxjpwrodxyiVgWU4AwjVUAJbjBRBL0HsRZm86AVvASxNpbzsBncB7EONvOwMZwHsQR7GMjCatgvgR2jnre7dd0fHsEavdNkZg4PQex2MAcaxVDeSn/ymjWxhc/gbk4x3A/UcRQEEhxIqcVJXAWBL2ynHWUBj0HkFatpyAY+gsgT5tMQ4pfaxFQWIohcKPh0EaiwDCLQrpzCjEAd3UcolX6kjaWySD/UUtBOI9C1QIPPyyVOpBRemfwAPnPuJpLBGlgAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-balloons { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABSxJREFUaIHtm2uIVVUUx3/jvRo6jsmoU1rZ9ILsQQ9h6kOPIYMeMgYS2aeKCA2LiNDKCoymD9VABRVWRFQkFllNJWhZ02MQSntp2oNmyAo1dDIKH9M4zunD2pd9zpl7Xvvsfe6l+sPm3jl777X+/3v2Y+11zsD/KBQzgHuAj4EBYBj4C/gKeBQ4q3bU7GI80AX8DXgJ5S3guNrQtIOZwBa0oGFgE/Am0E910XuBObUgmxczgJ8QESPAE8DRvvpxwAaqix4ELi2SbF6MBT5D39UFEe3uIHp47wVaXRO1hWVo4nfHtFtD/Jxe75amHUxBVl8PmaflUP25QCeyWictYh5wWSGsc+BONNl7Q3VXAIdIJ7RS3i2EdQ58jSZ7QajuW7KJ9YDDwLQiiEfhGGAJMv++A34BelVdC0Gyrb5+TWQXWylRi55TNAPPUH1IblRtLg9dv9DXv61Kv7TlERPC4cUjC2YD3cCxEfW/qs/jQ9efR+b0CPBQDv+tJp1MBbcB7yNDEkRcD7AbCQ7OAfapuqZQ35OBNwz9+hG2mwomgqcj8W0TsAe4HViFDDOQaGmzz/ZhE2IpMGzSyUTwCiQc3Am0Az+G6oeAT9Eh44AJsRRwZTeAdnQcHN5eKpgK7AC+V3/nWZjiyjKbwqLwjnK2OnR9DLBYXd+D3iubkCF+IIa4abnYjUSNKci88YCOUN3DEaSuUvXdMcRNyu/k22FSYYHPYbPv+mSiD/IrVZuOFCKylMfcSAyiSzkbCl0/P4bYIBJpNSBpGxtiDyKRnRHGZGh7gvoci+ylFbTF9DkCOQp6wK3orSsPOpFF0TnWo3/lPuAW4H6SF6Qh4ExlY3lC26TSA5RcivTjvRxEtwCNys7ThjY2Ake6lRjEK4ZEK2UNMh0AliJ3Pm3flcAEx/pG4cEMBKPKWmCSsnca8Dp6q4u6q1faFNGQoW0H8LYFn33Ajejz8lHIgeMMZIs7oNp8iI7WaoJG7EZM3cDZhSowwEvYE+wB85TdcpWSZfQ5w+lIjGxD7DeIqMUR9a8WpCkRT2FH8CXK3uaI+iEkSqs5GpG7k0dsl7IVF5Z6wF1FCEqDmcB2zMSuQoe0LyS07adO5jJIqifqwVe1MoJkGitiJ5Fu1a+rp4YlJKbeQTzpXkZnSKYjP0KS4KttErY1XMrIItSOnKQmIIf0rUh0tTWi3/XANap9u7r2J5IT84AvkAOHq0RgzdCKvqOfuHSU5TzsEv6R5rl0ZFPws8BvVcr8FH33+75PtMjJGaYRndf6IEX/EvrUtMsRR6tYSvx2dEoKG32+Ps0JbY1hY0g3AAsT6helsPOl73tUkr8uMIfkvXQAne2Iws2+9i+6ImsDC0kXZU1NsNOCTvsMIq84WYeNDOAPwInq+yF0Cmc3Em/vQp5M9CTY2Q+cimQ4y0i8/poFfk6xiHwnnZOQu1uxcZ89agLbgYffnkk42E/wHa5O4HEKeI5kihvQd2d5DjtPElwDNhB82lE3mIsmuSKnrQcIij6I/Ijjc9q1illogh9ZsDcP2dL8wreTLlwtBCXkZRZPfY6zYLMFeJnRW91qJI9dc6xDk7L51OAigm/0ecA26iDRdxOa0FrLtkvAbQRTQ73U+Jg7EXmvuUJorgMfs4E/fD6uc+AjE5YQjKNnOfBxrc/HJgf2M6GMzkt5wOcOfDQAP/t8pJrLrsb+MLJ19Ku/98W0NYWHPGGsINW//LgM2XYC5yHZyDRZDxNs831vjGz1L8Jk4DnkNaak8/Z/E/8AHsENFXXpp7UAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-benefits-assistance { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAoVJREFUWIXtlz1oFUEUhc+5KxowoKLBJkRjo6liwEIMWEgEwRRqIQSxD1iYLmLEJoKpRAWtLAyIrUHsLARrBTGKglEb/zCIiI2SzD0WeQmzy9t52fXFytPN3L/vzdyZ2UcUJGnI3c8A2AHAivaaCgCekbxkZu9Lvdx9JITgWiOFEOYl9ZRjhjC3VsUjiCtxzXUFhl3RanwjOQHgY61Fb0jSIIBxM2NjqjflvCJ3H/2bwrFCCPejFZiJbakm+9AuAABfywzt6vLa+g+QAtjexjqluYrHcEWSptx9A8lPdatKoqRBMxuuDGBm2wDcqFscAEiCZNKnCPD0bwquUnPxIIfn7vuqZCL5RtJmAF0Vwr6b2dumlpK7ezGE8LOZzd2HQwi3Kr4Fq74JlzVN8kiFX1hJqwFYAPD7nwNIGiPJLMtGzewJl9p5i7v/SuQ7zoIkHawFQPJqY58vSDomSVhqoI5EvnvFPSf5uBbAsiR1SFrfyq+uSi+iSOckLbS6UOoql1XS3irBkt4B2ERya4WYH/GHaQ4ghPCgCgDJ6wD2SzpRIexllmWnlge5LTCzo1UAJM1I6jGz/gphi/GgtAfcPQCYAnDWzDrd/S6APjMbSMRcI/miANlrZufLYlJNaCSfAzgkaYjkbUmPEv4A0C+pszDXnQpIPcd09zsk+8zscgjhoZntbgHwxcxyH7PunjzqpUZ3F8kRAF3uftHMTrv7qxYAzfIlz29uBdxd0R8IlzQAYNrMNrr7HrR4E8zsZJO53LjRW80BALwG0NcIzABMRIlGUsUraDYHGA9IjhcJ2yl3/0xyMlezidMBkmPuvtOK61eQpEkA3ZIOt6i9SHIWwE0zm48NfwA9Cz1FymudDAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-bins-recycling { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAqdJREFUWIXtls+LV2UYxc95ZkwyC9GFqyClRYEVuFWJSN0aQRRRLRJEpFqMFi3aBLrQshYhKIg/QP+AAhupRU0kKFHQWJQEJbqQ0dqMUA5yzmkx3+9w+84v5n6TGOzAC/e97/M+z+eee+9zL3C3i3cqse1XAaxO8jyAVQBuARgj+SHJMyRv3anasH2fpD8k/ZXk7TQk6U9J3yQhAAzOkuBZAGtnyf91VZ2fh2FHVa3s5HqqqkYAPAkAVXVvkv0kAwCDtneTXNIDsKOq1sySfCTJ2e4kyadVNdoMILmtMb0N4AvbD3fmP1XVJ0lIMkifsv1aA2ZZkuVJVth+RdLFJBt7Lu4JSaO293QdOAHgHw4sRFX1Q2N6AsBzHZjPBgYGHusp/nKSo1V1j+29tocHSb6X5MU2xUmeI/llo8BYVXXBttreWVWHG1u+BaDO+lLbx5Dkmbb2S3q/CSTpUGNtXNJwkqkHPclm20ONmF9mfAvaiuRxALtsh+SbJCcAvGT7Aslrtk8C+DjJgclwHvlXHei48Lmk/ZJ+68bZ3iPpeM/ec0lYAL6z3bYrTeukVbUdwPqqeqhnaXn3wPYEyZ0kUySvAPioJcB0osl8l3pOh+Rbtids/0hye1VdnFq1/WDLW3BwNhDbDyRZ0RlLAEDSu7bvn3GDpEstAD7o17GaOqi62W+yvgD+Ky16gL5/aBa9A4sfYMEfI9tXSb5D8iuS4/0CLMgB22MkNyRZZ/t7kr9K2pekfyclnZqv89kesr1b0mXbT9veIumq7V19A9h+XNLteQA2SRqx/Xpj35Cks3PlnkvNVjxK8o25gkmuAnA9ySPdc0keBXCjLcA02X5B0s+Sfp9hnLS9XtJNSWckDUsat72ubb1WnSzJ2kz+yIbkaZKX2wL8r78BXjM4Hb1Xqf8AAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-business-and-investment { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAl1JREFUaIHtmr9PFEEUxz8rnEZtCBfjNcZG+WHINXY0aiyuoACUxMoYTCiO0EDp30BCKEgorSiMofEPIKEBIrWh4oREEQhKQkyw8I5i7rhh7y7c7s2bvdudTzLJzt7se++7M/tmdm7B4XA4HI5YMgscAeeGyyEwY1FHU2SBkmApAoMmAr1hwgjw2JCdRnhAnwlDpgR7huyI++g2YaQB88BJyGvvAXMGYzHOBLXP3aMW7A3UsTfWYoyAuSHdMTjBccdUdk1TO09uoxYOYbgNPPWd+wb8Dmkvueg9/BbIo6YEG/OqDUqo5e4SsKL/kEd2adgOZUoXvN8GAUmXAlSHbolk4CVuWnKC447k25LOCbAG/L+m3V0gB6SkA5LMjmfAgwCxvBaMxYrgrQBiAe5ICrbxDBeF2wfChuC/vvpHYMdXJi3EAdhJWv5tnizQ7zuX1o5F1/E2evjAV79fp81z7fiFXCh2erigHaeATJ02I8AGsAuMW4hJNEvnND99wr4im5byQC/QA3RpfrrK5yplGPjR6YK3CcYHm4IlklYGuBWg/UOBGBoi9T68BawCn4Dv5XMpYJqr084Q8B57W0qXfiSGzz/Uc1rhpZCfyId0hS/AqVZ/JegrMBJ3U19A3ASOhfwE6mEpwZu+G/qmDcSWQC5pPQPWtfoozf+D3w+8QyaRiSStVQOBLRuO6bKHJZLWngEbBQM26iIxpP+gtmm+hrz+CfCZYNtCzeK5jfi44wTHncQK/hVpFHb4CVXBixEGYosFqM7DHupr2GnUrmKcPnk4QH3ykIROdTgcjg7nAoMWmEF6Wq0vAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-business-investment { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAqdJREFUWIXtlU1oXHUUxc+9E/xIjG1pQtMKNQs1LgpByCI721KM3YgEoVBcKIoGwYLaVRYlK3dSAoIKLd10100DkQqiAVtKS0uRkEULxc+NEYQgcZU553SRCUxm3ptJOonZ5Kzm3XPvPT8e7/8fYFc7rKh/kDQaEa83NtmeBfCs7dP19Uql8j7JC01LI2YALNp+o8C7mpl3m0hs7yH5pwsk6QWS3zXWa3NNInlL0osl3u+SepsASF4sGbgt6SDJ6kYB6qDvlOz8Zl24pJMtFp2RdLbIawNwTtKnZb7tE2vhPST/KCGtSjpAcn6zACTvSzpEkiX+b5Ke7oqIXgAf1fatU2YuA/gHwGSRX9MrRcXMBIC/AJyw3VPwMQJAb5CcBvBq0ZKIuALgpu3zBQHViBgh+XMZWUR8DOCY7fGSlh+6APRk5nCRK+lWZu6JiCZfEmsghbPA6smyfbjF/rnMzNmyBdspSYyISwlgRtK1/zncEfFZZs5nRDgzxyV9IWmp1rAi6V5E/NRhliPipqSHkqqSliVdy8zjmTnd3G0/ZbtP0n5JI7Y/sD1A8nOSv5CsklwmeUPS2zXYUyS/JbnIVf1L8rrtdyT1S3pX0pDtJ2x32d5bjmtPFZzXXyV9KOl52xVJT0oakvQJyQckv5L0mqR+22m7W9KwpEmSiwVXwFR9Zle7d5iZgwC+Xnuund/63y8BmKifWeup7y1TKYCk/wAsbQDwuYa5vwGsNLTty8zuTQEAuFypVCZa+ABWr+IGoLGIWHc51f6y3yuaz3YB261dgG0FkHTE9jOtelp9hIO23+yQ4ajt7x8LIDPHAIx1kp6ZXwIAyfKeTgK2QjsO0PYq3qwkvSVptL5m++UNAdiesz3QIUOf7b6G2oKkBQCIiB873L+rrdUjrd0iO5QGH/sAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-car-service { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA3tJREFUaIHt2kuIHEUcx/FP4uJu1FWjIRcFAxo0xhhEEAWReFAQL+ILxRcIRvBxCYoggoiggg9ExUNEEEQkRMGDB0FjIhKFeNGoqFkRMV7Mw2DwFbLueKgZU9M71dMz3TMEt75QbE/Vv+b//01X1+PfSyaTyWQymUwmk2mKabyM9zGVsFmPT3DZuIIaFafha7TaZXXC7oN2+yzuGk9ozXMCvnREbAvnJWw/jGzmcG0Pm2NwP3biT/w9gvIHduAOLBpU8IsFsS2sqSC4hQNYHrUvwZaCzeGGxc4Wvn+T8CNXYkU7oKLg8xP2W3vYPhu1vxTV/4yrsLhqMBWZwI34NfL1cNXOj5kvoEzwth62+9tBnCrcgU79hYMqGZCrI1/7MFml03b1BbdwETZEn7cNJWFwvo183lxm2BlmqxLtJyXqpxP15+qetTeWOW+QV6Lr9VU6/KP3Hdute0guwesJ2xY2G2J4NcAy3Y/Ryn4dDkqL+EtYXtbiixK7VsHpcw0KqsKbke+n+xnvUC5kmHJOk2oqsC7yvQeX40l8JqwqZ8XGT2hW7EcjFFbGdyUxbY4NV0o/x8OUW0YqK80DJTF9WjTeWGI8SNlvfJNVkWU4lIhre9H4RN3r2SAlnvSeH6GgKmzSO8an6N7uHcSVmBngy+fwKI6N6n6qEWwTFP3vxavCbrLnCeNk4S7dnmjv8D3uxgV4Jqr/HW8LS9S4mcb1um/ArXijSucbpIfwFmHfTDj+Nb2kNVnei0WVnWD2lrQdEI5np0sfIY8W1okyN3WPbJfU7D8OJkXb47qC19bsPy7+O/VNlFlV4IzC55aQANyXsJ/EvdKnrSrsxmvCCtGLs3FToW5F56Ku4OLxcSfu69NnOe6s4fMF3atCkUW4RnfGdWnnou6QLvafrdDncE2f/Xy0hG1yzOJ5FwuFBSe47jNcZJWQSdyTaJ/CFTV9XCfMFalJazWOT3VuWvBxwuZ9lFwq7PSGYsEN6Sz4/07Tz3CRB6V3XU1yJh6pYjhqwW/hxxH7gItVFFw2pMt2NFV2VEclZYK/kd4Gft7+e6jP948r69FYHI+bn0H4QUgDEV5cpTINHw8Ucj0mpHPSc0ISAP1fIG8V3u+egt/wDm5zZCL6SshtEX6IGezCu7hHeE0zDubasU3hl3YcM8KroYeE/1fJZDKZTCaTyWSa5F8vPbzjcudfKwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-castle { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAv5JREFUaIHtmj1rFFEUhh+/EhMDKkSJGAQ/kEQQiUEwiIogdkELKytBLOzEyh9goz/ALmBjIRaKWImaQrAR4kdjiMGgBhPRqBgNfrFjcbO6ud65587eu7OTmXlgIMs977nnzc7OnLOzUFJsTgHfgEg7fgOXDfEtwB1DfATMAIcNmgFgOkbzAGg3aC4Bvwzx34FziV3WMB5TSPXo0uIPCfG3DXtcFTTHtPhVQMUS/9lmaKnVLqxMuN5aR76kmhXAkoR7/EUyLKHrpXymQpNqvGr2NXxUe62ffjr9wMaa1+uAfYJmkIWmpT2s2E4NgEkWFmhiBJgF1gO9Dnt+AZ7M/70TWOugGQOmgDZgD/a6f2A5rUMYzhpWw76n9KKjNJx38mg4si1Khr8GLCQtZm2LkuF7AQtJi7s+4i7UrcnW62bp+ABs9jEM0I1q8GcyYCju+ARcB7b6mtXJ4rud6DqTx6u0leUNyhsBz4D3wHZgUx05PgJPUW3ibuQxsiG4nNIPgR5NNwi8c9BGwE/gLGrurdIJXImJb+itUzI8gvkrGYAd88VJhk9Y9h8yxDfV8H5Bf0HQ3xf0a1CNRSYMTzvod1n0EXDGIccNPAyHvEq/doiZENZfBchhJaThSoCYEDmsFO4+XBrOO4UzHLK1bEFNVjbimpIqnQ45OpwrCkA5LS02Cme4UePhHDDMv/FwAPkph84o8Ag1Hh5EPcpJHZfP8E3UQ7Ja+oEXDtoI9ezpuKZvJX7waOq0NAwsi9F2I38vVgGOWPa/aNA01XCfoD8v6G8J+nb+/6c1zbDLtNRr0Ueo35RIXMPDcMir9JRDzKSw/jZADishDUcBYkLksFK4+3BpOO8UznDI1rID2CvEtAnrPQi/pAM2OFcUgHI8TMgb4DSwDdgCnAReplxDInze4eeobzR0VgOPPfI2tZe2HQcsefs88mbSsMtjmLE6c2fyM+xi2KUX9yZL92GvHtmVLBlOhdJw3imc4aS99Chyr2ti3CFmAnNjIjFXh6Ykt/wBGH9Lk1FVC9oAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-close-btn-dark { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAQZJREFUWIXNly8PwjAQR1+QkGBAoTYEFgsfkm+DZSxgsfMgUXwEEKxJ2Z/SXq+MS07tt3svWdb04M9qC+yBSYLZGVAAi77AGngAT6BUlsiAaz27AubNwAq41wHTWhK5BTd9AaZ26NQIaEl0wU3v7GDmCEolXPDOmZoSOXCTzNKQEMM1JKLhMRJLLbhEQh0eIpEM7iNxTg33kUgOD5VIAveVCIaPNO1SV8aAn8AX/vM/oPzyLOkZcADGHoJJTkED98mKJFwDiwZcXUICV5OIgUdLaMDFEq4XjoFwkUTftVwK95H4uJZ3LSaxcJdEazGB9mqmAe+SqIBZX3DDeznVhNsSzuV0kHoB8idIPUjmYAQAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-close-btn1 { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAATBJREFUWIXNlz1OAzEUhAM1KRFSwl+JKBBNbss96AISEI4AIckBEFJuMDM0JrGszdprvyfx6vF8n7Ra/4xG/2lIzgA8khw7dJ8DeJJ03RmQdA9gK0kAFpYSAb4O3RuS0zRwC+BH0VhJkLz4g0fdnyTPdiFJz+qYVokueNT9EAcnAL4sJTLwF0kn6QIziQDfFMMtJarhUcG0ViIDf83CWyQkXZrAE4lViYQ5fIhEDt68l2Qk3l3hJRIH4G/m50nYz7MSLvBSiRr4sbHjkXHffgZ8AtOjfBDcRaIPHn7DpZtEBr4gOfY4yovhUdZWYgjcXKIGHq2tPsqb4c0SFvBEorzLEl4lIb9reZ/E/lou6QbAtyW8TwLAB8nTNHjn/DRbhe41ycmhoPfjdE7yyrq7aX4BbIxiN12xUnYAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-close-btn2 { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAARZJREFUWIXt1r2uREAcBfDZWzARlUZHN62lYZ5WotSpNMKTGBUVBS9wtrk2ezex4+tGNplJ/oU4mfPLCHEjhIBcuH6uLFcABVCA7wHYtk3KsiSMMWmWc07yPCemaa5GQDZVVQEA2rYFY2wxxznHNE0AgCRJpPv+jjzkeR76vv+IeC2v6xqO45wHkCEOlK8HLCEOlm8DvCO6rjtavh3wjgAAIcTecuz6DhiGQTRNe17ruk4opXu2ImSr+PWZCyGkb8eKWR+OogjjOP459vv9jmEYjiD2l8/3DiLkoTAMF8tPQMhDRVEAAJqmgeu6iznf95+IOI7PA1iWhSzLPpbPEwQB0jQFpXQV4DYrrlrf8T+gAAqgAP+5HqrETqyatSHbAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-consultations { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA+pJREFUaIHt2VuIVVUYwPGfZ6QyuzhlVoJ0IagEIaiXLnQjKIjIiBApISEwpMBeLOj2kEQRhZSF9tKFiHkowgiKLKOiOw1lWFAZI4QUdDE1y5lppoe1t+fMpX322rPOnLFz/rDOvpy1vstZ+6z1fd+mS5cuXbrMXGaNu74ca3Au5k6/OeAAvsATeK2Viu7G6Axrj6Z2Mp/hq/B6dr4Xb2F/amUlOR5XYHZ2vRx9qZW8Lfyiu7AotfAKXIJhwab+VijYmwl/oBXCK7JFsGkEh6USWsuOR2XHX1MJTkBuyyzMSSW01rzLjGD8blKZQ8XhZHScw7ObdznIhViNnogx7+GpKIumiXyjX1PQ533VgodjKtrU1yBjXkUZE4iZ4U3ojRyzVdjyZgwxxr+QtUOajlu0Os7hmEe6ndwvpI0x7MdneBP/5DdjHD4ZS8VtS0X8LazE+0r0Ldo9mvENbsD2xptltqU3VNuWitojBfr6CsbFtp+FCYua4W24MqJ/Gb4r2e98/Bgp+1jchZuwAPdidR6Uj2bHO7C+QEivdI/0IPYUfN+HZdn5aRiooKMmlIuWCD/YothF6/cKStvJCD4WHD6RztiWRrJj7eBHJ5E7PJgd21WanYyjG84H/7NXJPl/eBvOwwo8rv0B/9lCjRz+wknCSjsZw/ha/dEtJHd4A57FmfgSLxlbph0SEoedk8joxS3SPR0n4EYckV3PwedNxmzCrbGKnlO8eW830akevNtk3HS0Fwv82pj1GWZs4HEzPhD24rMmGbg4G7yi4d46XFygrCo78DS+LdF3CO9MVeFczM/aAnyi/muuyvpcLfxvRvGb4HjjK5L5FVteMk7FmBkuy6mCU6NC0L9UqBvnDl4rGJtfr0tm7tQZ43DZfXgAK7Pzw/EKjsuu12NzOvtaS0zgsdnEOPtTrK2gt0dYP1K0qNg+NtJaKzhJiKuXCYtGDPcIj9dQojaI28oqj3V4CNcJ75IvVS2DuajCmCJquKBs5yolnl14sMK4nFXCO99U5aVBPF+2cztqWjvxUBv0ooOzpY4hpcON2Uqy97kJyH0slU3FCv5TiGq2phZekZqQ+o7iB9IuWiNCcLIcl+FJIe1MlVvvw+6C7xca+8TOw51CPQteTmTHGE7BL1qTAg4LMfx4ani1ydgBIW9vCUvwVaQzZdtunD5O331NxnwoJD9o3eJSE9LFc9QrF1NhIW7PzvuFyOqAUAbakun7Aw+r19jzd0sfJdDfFp5Rn7WNwquTnxruXd8+01rDkUKZKXdwR8P5hjba1VIWq299eesXcvT/LSvVnd2DM9przvTwGL7HNe02pEuXLl1ayr8JpI6ju4KOKwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-council-tax { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA91JREFUaIHt2kmIHFUcx/HPpGd0JiYkI9FokkFEcSHB7SJiVDCiggGj5qToQUUi6MGIoLjgSRA8uCueFNRxQ1HwYFA0B4MexIhBTRTGhVGTOAkSF8wMMx5eNdMUXd2vqqurY+wv/Gmo9/7v//+9qnpbNX369OnTp08jqzCOc3udSBVswBTmMI27MdDTjLrEMJ4WhKbtfRzfu9TKZzW+1Fxs3fbiil4lWCab8JfWYhvtURzRk0w7ZBRviBfaaJ/j1OpTLs4F+FExsXX7AzdVnXheangQMzoT22jjWFKhhmjGsFV5QhttAudVJ6U9V5mfW7tl07gXCyrS1JRhPKO7QtP2AVZUIS5NzNzaLduL9d2XOM+t8s2t3bIncGQ3hY7izUNAaKNtx2ndEFvG3Not+xM3lyW0G3Nrt+w1LG0nqNXWbAwvCXe3DA4KA90EDmAkiXEGFpcU4wdci215Ha/GPuX0/JakvYUZsWq4CC8I822n8WZwv8g5ewTPliT0a1wYE7SBk4UOKiP+h1jZKtga7Cgp2Os4KqfYOgN4oKQ8fsOVjY3Xkt/rhYX6McJjVbe/MYuhHAmPC+/RwSZlJwqP93qsxXH4qUndrfgdl+eIC7uFDqvnP5jEW5q0ORvTSJ67/qnmnTOC55OAaZ/92JgRO+/rtShGUDtiBf8je+NeX7BMYjMuwzV4Nbk+jbOb+C3E95HxKxf8VIb/uqT8gPBIp3kuKX85w/+GyPiVCz4lw/+hpPyVjPKzkvKfM8oHsScyh7aCy9pfbseuNjGaDWLwHd5L2mjGDN4qnlp+Yu7wYy38NyZ1diu+u7kuIodK7/DOFmXvCIPVsbixC+3nYrCkdvZlXF+OO4T3cyXuwwkN5duEDmnHVEfZNVCW4FrG9SHh49kuLBNG6UvwTVLedneTUFaeUcS8w5sj2rklqft4gRzOj8ih0nd4dUSdiQ5iring05SyBF8cUeec5HdLgfbXFfApTOzCY22LNo4WBq6P5P8evET8oWFljzTclXF9kbBwmMKTuF04g0o/pidl+N8mbD4qI89u6dKU7wA+Scr2N6k/ibfxhdAhy1L+q4Q1+CG5lq4LWJ7y34RvcacwJW3Aw/gq5fuxcMZVZ0j+71WVC57DZ8IZdiNZBwhjwoB0eup6DS/mjNszwXPC3Sv6UXsU7xaI2VPBc8IB+T2yTyvTLBCOhiYLxuu54LrtwSPCCeZwqu0azhQ6ZmeHcaIEx8yJO8StpGKYxS/mD+JXyHdA2I7Fwt8lMql0US48ti3PiqtI4H9FX/DhTl/w4U7MKP2r+KOYXhP17ahPnz59/jP8C6rgZCuGhfQbAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-crime-and-emergency { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA4BJREFUaIHt2durG1UUx/GP5xyLd2vFVkRptWgV2qIoij5UEKWCvggiKB6QCqIIin+AWIr05SB4QSqiCIKooMUigqhQBKnivcbaoqDitSJe+mIvHo0POzHTyUwyM52ZnJMzX1gwSdZea/1mT3bW3qGhoaEhH1diJ3bgghHXUgu70e7YtrqTT9SdEKdFrpfVnXwUgkdKI3jcySv4KtyJUyuoJS9n4W5cUlWCG/VW1z04pWCcXyNx3i0YYzn2dmLM4tKsA/PM8LrI9Sq8hKkc47u0ItefFhh/Il7VW+EncXmBOEO5An/rzU4bTxSIswwz2Ijjc46dEMRGa9iHswvUkYm7YsnauLeqZAk8FMs9i2urTvpYQtL1VSfFBv03+54a8prE67HEOwb4L8U0nsQ7+A6/4zd8g+14VFgUTxoQ55dYzi1HIiIvJ+OLSPKtCT5X4zXhCYjPTJrtx/O4OCFeK+L3lmIL5hFxJp4SFq5oT7wab8suMs1eFn5ru6zCs3hYuOFzgvtwSLqIg/hpwOdx24ebalWQkSk8I7no7/Gg0BwsxycpfoPsgfqkDGcCL+gv8mfcrvddOx1fJvhltc21qMnAjP7iXsGSiM8x+CDBL6/dUbmaIVyvv6hHcFTMb0uCXxHbj7VVChrECfghVtDTCX7rlCO2a+/pv6G1sDFWyMdYlOD3oXIFt3FzGQKWCjuRLBwndEvdAv7BhQl+65Uvto3PcuhaImH/vikS7FthR7IZt2CN/m3krbECnktJtrUiwW39e+BFQod2m7DJeEPvN39W6MX/5+CQ4C0sjvhvG5KcsPU7UKHgmUiuc/DjEP9d0eI+ypBguuM7iT8j73+dIBauqVBsW1gzumzK4P8ivabgOuF86CJh2Y/2sDoDdneuVzq8l92eIriys6YOa3C0cCixK+Hzf4XJaOF9PE5P8F7cH3FeLGwC1gqPy5vCagvnxgK3JLMyV/n5mcIKfCXM3qQwYXs6NX2Ov8pINO3wRyWtuY9/z6uwy/IWX+Rc+tjY67S7mPSbXDZ5z8QKCc46po5uKHf9zT8P404jeNxpBI87ZZzt3oDzE95fUULs0ilD8IbhLnOHBfdILzjBRdq/M3Be2YUUZCf+GHURc5q0GZ4UNtfzmUPCIUAmkg7Y55utThK24BatRvC40wgedxrB407abumA8F/NfGZ21AU0NNTAfyvxD6CJlLDGAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-crime-emergencies { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAArxJREFUWIXtlk+IlWUUxr/PYXKyqESoGaVdELmoVSAigkzmwgokxBaD0GpWOkIxIQoudEQFESoF01k1bmIgFEQiZoao3Iw0tJDASIQh1HJyZJBx/vyex4Xni7eP79476BVa3Gdzed9zzvs855z3Pd/NshZaaOEJIKkb+BO4CxxN9p99qsS22yX1A//YNnDetiVtkdQDLALDtp9pNvF2YAKYcgAYD9sV21eAxcR24YlF2F6WZVkmaSOgJGuA74EF4FJKnAK4GT7zwC+SdttuXxI5MATcB04AXwOzktYAI8BkCPsYuBkt2AwMVAkpifrZ9kt1ySX1VAQ+AL4E5oCT4fchMB8uR0JgUaV7wKCkPkmfAT8kZ12sVfI2SS8Df5XIx4F7RbDtNtsvAvdLflPxO2R7ZUVifYWvpG2poQsYBGYrMp+yvUzS3lgLOCZpOXCjwv90g9aOhd9oQb4OuFOnZyOS1tueTvbmolpdfvQCiv3rkpY3aG9/kVhmuzPp2QPguO13bG+Q1AtcDhslUYNJ21YA16Kse+uRh4BP44zZDPg8FouSumsE7ExbA8xIWl0q69UQ8G4jATGkDPyeAX/E4tsGqt8HFL7DFYf+FgLea3DOa8WrAU5lwEwsDi1B+bmiAi5NOGA0bF/Virf9PDAefvOSXs+SZ3OmkQBJm4o2SHq7ZNtX3BVJOypi3wQmkvj9hfLvIvDWEm7vq8kBH5RsLwCTyT0ZAw4CAzE5ldi+SAP3JIbDDQSsSx7Chgr7W8VYrkJc3t7/BNluL/oSmX1SS4Dtb8Jt2nZHDZGrIvNf43/CbeAnSQdsd9bKbE3xGkLpqKStkp6znUt6o7iAIXJXvUo9FvxoIP37sUjEpN/3BUn7mk6eiMglfQT8CCwkxH8DZyWtbTZnXkdMh+1X8jyfy7Lsdp7nbjZ5Cy38L/AQZz/umlZt+gEAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-elections { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABMlJREFUaIHtmV1oHUUUx3+NttXUj9hoRWst4kerIgq5xgcxRGMRsShilFLsgx9V+qC+qVQpWtBoUBEfrCK2oBRFtFatIkIhxGpLa2urVqk24Edbv69CMMYkzfXhzHAns7N7Z++ddLOwfzjkZs6cs/+zM2fmzCwUKFCgQIECRxo3AJuBXuDojLlMOlYC40BFyZps6UwubqYaqCn3ZUlqMtAKrAaOAjYQDXgMuDYzdoGxAPgOCexpoBnYSTTob7MiGBJXAWUmBnYXMBc4aLXvyYhjMCwHRomO5CjQBZSAIdV2ELg4G5qNowl4CvfipOUvZKp3A58hI55LzAI2khyslv1AC7KQ5RJzgV34BVsBngSmZcI0ANqILkJxMgLckQ3NMLgR+Ae/YMvAlUnO0gz5WcCp6fnWhR+BQ8ADQA9+PPcD1xFwv92Mf/40Im8hi83aFDZ9wOxQgQJMx39a1SvjwCqkTOxLYbcWmOEbiO/RqYSUbCDTbLvvA1KgDAwDW4FzPfpXgAeB14FlwMshydxPdRRaQzo20Em0TIyTIaSoaAd+AXaEJrNJPeir0I4Vbke2E59gfwYuVXarVdsYcFwoMk1IqVYBng/lVGEaUiD45useYJ5hf7WhuyYUqUsMp0ss3UzgmBrSlOC7B/9g3yM6is1UZ8Zj9QTnwr3GQ0832qcD/yYQHAGeBVYAJzr8tuI+xrnkGeJf3DbVp7/O+CJ4UzkcsNrbVPsfwG5LNgB3At+oPr2W7ZlIoTBH+Ynb8kaBu2vw61V9h5EZ1zB+VQ7XWe0rVPtK5C5pIzKS5yDTr4JUPa6rlceV/lNF8iYmXrxVgL+BRR78Fhs2Hf5hubHAcHabpVun2hcB1yOjMQD8BwwiL+IKh8+ZwG+G3/Wq/SGjbQA435NjC3BY2T3saROL5QaJsy3dXmRUWtT/S9WD1yOr59fAow6fy4hO3VVK9wqwBTg5Jc/dys9HKe0ieFU5OmC1H48E9xOw0JBO9fcFZXeLw6deZGxZgpSI9eThc8rHIA1evP+gHL1mtXfit5VcaNm1GboRJIefQPL8hAZ4dht+25M6Jr2N+chqCtElfxbwTg0SetEyUUKqo36kZh6q4cMXJr8O6qz1zVyzR2oqYh/C9d16HbykHPxOPu6GNN8yCXyTyj69pWxRjqY69LQ+CbgorlNcDs9B9mCAjy3dBcgWVAtvI588jhTsPP4ijbG56pUsnVkgJElXPawbhN5V3ojrEDfCukQbBD63dHrZX4P7wqwHOSXt9aYZDv3ArbgrvEToyuVDh+6Q0p3m0M1Wuj/TPjAQzMrwPFcH16LVQjXp7f33DCTQA8jNgw29fWUxuhDN4whcAV9utNsB6+kct7FnHfA+5HQHMQG7clh3HCYaWLuhW+yw1dcsWQUMsqt0kyKPtyI50OfQ+V7GJ37umGTcY/CYZyvtEW5GCnxwX5l8j3wZqIUv/fkFh1k3dFA9bzvRRfXt+Nw2TEWYt6wvupQmdP6OIUe3PGIc+ET9jixccQHvQi7W8gqdjguBU0yFGfAM4DLLIK+I3Y/NgEvAsQ6DPGIn1Rk6IWBzlTYVjyBfCfMMfSaOvbr9AP/PHnmSwxhfPswRLgPv13ptOcV8Up6PCxQoUKBAFvgfj0Ys4sOv7FAAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-envelope { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAWhJREFUSInt1sFLFVEUBvDfTAoFpvsiBEVwK+2CBDctgxYZ+C9of0DgyjYiLloHwvsfalMEgURBtWgRtImHLgV9tBOM92wxZ3qjvEczOW9c1AcX5t77ne/jnnvmzPAfNSMpPF85N68Tp+jmk3l8icVRjo+YhbcNmOXjQ4KfGLtw0sqhm+KgITP4nhfKvYYMN8iq84XR39/L8AJX0RqhWSs8wGrhyI/QqdHoCA8L+o/FxnNMxOJNvK7B7BVuhOYkdmL9N6GNxSCkWMPxXxgdR9byrrWE/cL+GXIP24V8z+NzBbNPEQPX8GwAZ2DgVyxE4DieynrhMKNucMYj5ja+DeEOFTnBE/1Svou9Abw27gRnDOuy7jVM949p2sWtEJzElqz6DrGpX2zTeFdCr9TddLBsMBKs4EdJrUoV+Ab3cR1TeKDi1ybJXZtC2qTZP2F4msr+NZrCe5iLh57qfbPs6Mne0ZlGjnWp+AUVYUlVvJmXGwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-error { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA+9JREFUWIXFl0uIW2UUx//nu4mddB65KRPC6OQ5kcBAFxZLKy0UqsNUTEG37rpw5bMrEcTdiIKg4kIUcTW4UBcufI04lYHWKS6EKaUwqc3NTTSIVpI7xTEh957jIo9m0nsnt2mgZ/d953zn9+d7nHsucJ+N/AYuRhenmpO7T4lgSRhHSCHFkGmwOEqpf4RREMJlEvrWqBgXAchYBCQSiTmN6DUBzinQlJ+kDNxQkHfiZuqTDWzYowqghUTqBYfkTb/gQRPgGhSdMwzjl7sSMDc3d3AicGCVFJ4ZBdxvzNxSmnqxWCp95ObX3OChYPA7UnTmXuEAQEQagHwkrO/WrPrPwwRQ9NDs50S0PA743sxYiujhQs2yrvZPq/5BJp56iQhPjx3eMQY+XphfyLoKeHh+/iEorOyzXhi4MISxK4xNL6cCTbFyPnAVYGvaqwAmveACeb5klh4XwXtecAifZSWnIbzmJYIIZzLxzMnuWAPaRaYVbK0S6AEvuGGaHwJA3aqv6WFdJ8LxQXixXL5gWZY9o+tfKpGjIMq65AOIZ2qW9UVvBxoH/817vXUGfurCu2aUS+f7dqIH7/pN02xQMPgcMzddBTDlY7HYZE8AQE+4BrYDTqcTqXcH541y6bxA3h6EA0A2m406tv2NUuqAR9KJUCh0AugcQVjX3yDgQS8RRDiuh3W9btX3nG3dsn6sWZYxCLdbrXUFOuyVDwAIcq1mWRdVe4DUfsEdEa+47cQocAAQIA10jkCYZ4Yt6IlIJt9y8+VyuWm/8LYCCfcEAGBfi4BdEvnBzbG9vX2LhNZ95gGRsm8LUPS3H7jbheu3gdexrwnkZk8AMV0fBZ7L5abvQUThtgDC5buFZ7PZaLPRuOT5RIeI0NAu2Z1XwF97BQpjyyHa8xntv+2er4PpU89CBFR/M82tnoAb5fImhAtukaTwmCbyVTKZnBiE92IGRKTn04dFOetehUggq+hc/F4/EIlEWgDyrnqJskrk6KHZ2Q3Httfcnlq3WEWmI1VRzroiFXVLxcxNR+TZnZ2dW0BfS3YKpwLlpLlFwKKriM5iz/LqN0awUiyXXu8J7/dl4plHWTmbChTYDzKyCV9xiI6ZptnoTu1pyWo7taoejvxJhLPjZjPkJjmB5VKl9Ff//B1Nad2q/xoJ6/+BsDROuGLtyeLvxauDvjsEAEDNql/S9fB1AZY9mhT/JnyFnMCyGxwYaEr7zTDNzzQn8IgIvh+Fy8xNCFYcomPFP4qeldbXv2EmnjkJ5bwMpjwUJoaEVwWyajO/X6lUqsNy+/45BYBYLDYZCoVOKJEjAqQhEiZSdufDUtCAzU6F8/t1vf/2PxrtytiWNLtsAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-events-celebrations { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABqVJREFUaIHtmmlsVVUQx3990CIIFRAoIgiVyKJIFNkKaJAUhCBqookaIIooiUbBLbgggh/cABECkkhKAEkkohhjgkZAXMCVuhNFUahaKEoRpLJWeH6Yc3nnnnfu9u5tUwn/5KR9c+b8Z+a9c8+dO3PhNE7jlEcKyAuhVwpsTMhmW+Bqi7wgIX5fTAG2AncBZ1rmzwaWA2ngr4RsDlR8a4AuwEVAGVBDPQQ9RBl3ApoFdFJz44E92vz3Cdk8T+M8qv3/VUL8vigADmpG00AtsMWQpYENCdnMB05Y+OclxH8SKYvsGPCJIWuMbDMTuxPwoQBYgv3caJ4Afyg8Rva3bRtzY9o5C3g/wMYDMW24YPuFUU6EQQfCneheaA3sBCp8dGYDV8SwEQrjCfcLp4HVQLMEbBYDhxXnIWACMAroB5yRAL8nhuI+KcOMcuCcBGwvU3wzE+AKhZ7APqIF64zfgUtC2hmFbGcT/YHfSGbHBKII2EFuwTpjD3KiB2E7sn3XAt2MuTjBNiGTMwTic6IHWA28CTyMHCxNQ9i50OBYHNbBEJgKfIPPQar/GtOQU7e1MYYj6aSOv4ES4IccnBrq40McNENuYe2AMcgPkRNsJ/bCGI4tM7h6xeDSca/GuTkOUR7wEW4ne3voFgODA/i+1HjMjC4XpJTdnYaPYwl3iVnRBziuiD4z5noi9+Jdan4fcnh4oUZz6u4c/bkeeB3J7517t22cAH4F1iEJTCQsViQTDXmZxdA1HhytDGc6RHVCYRBwwGLXbzwT1Ugb4Fvcz8iFwD8W8uUeHD00nfKoDhiIEvSTMW2dxJ0eBqqx5+mDNZ2nI9qyXY8lyB3DL9gnItrxxSwfQ4Ms+sO1+ZER7BQBX2PflnN9fNgVwUYoFAKVHsZs3+xoMtdvy5A2ioGfNV7zDFnjYd8Zhbqy1+NhWBxAsiwbSi2ytPq7Ddgfgr89sB7oqskOGzpmYeJIwHxs5CG1J/ObPUZ2XjxCza0KwVvowavnAM3JlIbeAwYgFdB5ZJ747sghpkDcYHEsDVxp6DkFwhkBfHlIamjjbKfpdQY2AVdZODojWd3k8GGERwr4yeLcNEOvt5LfFMD3kIXLGQMT8zomppDtnJnAn6vkfX14+gP/WricsSRRr2OgJdnl3Z2GTgFyzbX14MhHkhuvYHcjX0iDwQqynWxv6FTi/bz6qGW9Mypwn9YNAs4prI/hhk4/j7VFuB8szJ1SXAf+xkYK+AO3s/eHXLsIe7AHgIsT9zQAI5A0MgxexO1wWYg1HZH7thnsCaR6Ua8oQZ6ItobUN7f1hyHWzMH+60Z9wMgJw5Bt9AXwMtJBTCMNtTCtywLc12JVgH5z7E885SRX7/JFCu9bw3TCNbhWG+v8Si0TLXaOkVytKxRGWZxwxl6k2eaHScaanj66myw2no3he07oiHe2c4jgCkKxsWaEh14nC38V9dgmdbDA4kgaScbD9pC2a+tu89CZbLExKVenc0URmUpgDe7GWheLfnfsfaJl2rrpHrbW4w72F+rpoNJRCNyIBJJCSjFHkC1uOjMa2YIvWXgmkAnEVrhvqnj1gG+P7z4gtbOiOAQjyX7B5Gbczg4x5rtrc69YOEvJvnaTeGOnE1Ibn5oAlwtP4XbY1kWoVnO2l19mGOsfT8CnFJlXKD5IgM+FbmT3ks3T+C0lt71+pBffasl+qvKC+aR1C3K5HcSdwNQCl1v0Y2EM7oDXGfMzlXy7ZW2Vtu6NADuNkG7GKqR10kiby0eyMq+8oRKYj3/7JxIWGga6a3NOWXavsaa1seY6D+7GyG1qh6E/ztC7AHsHxBmLSfD0b4b7nqsn/B2U7KixZpCmvx/7tz8A+M4jgGrc6WoeUiAw9f7Eu88VC3oqWmHM7VZyfRuO0/SXWvjuQ65BM4DjyPadY+iXWHS9boeJQS+r6kW6tUqmdwCmabrXGjzPke14BVJI8Lq3Pq/0ypHWi7O96zTgHmTy75mafLaStdFkLyjZYdzFevMNwBqks58fYLsP7iywF1I2XhAthOhYijj6sSa7Vcn0XvCrSva2JivF/YLpZuLVsVogb+nWKboiv3ItmT5yPySAzpreu0r2oPrcBPdJ/Bp1/PZdkliJOD1MfW6hPp+v6TivSF2qPt9DJtiVuA+4Bo/LEMcf0WSVuAPegmRpTvdyG5nEJeh6bZDYiFynDjbgLqL/CLyj/u9LJhtrVdeOxe0Pe2ER7ppUGZIs6PhU/S1E8uCxyK/+v0Rj/N/XWkED6xGdxqmC/wAp4vTgN5Ws/gAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-events { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAB4FJREFUaIHtm3mMXVMcxz/Taumipqqd6qY1uinVoFoaVEqorYTUGrFN7QSJSOwEQSI0YomQUmsqGkTaqqVISLWlLarohmlrGTod1b2eP76/k3vemfPebPe+ofFNbs69v9/Zvvdsv9/vvldG62GXIrodQK5UHSkFvkSECl21QO8sGi72lrPEUGAL8FUg3xvoBWwGNpS6U1liO7AskHUEvkcjPKHkPcoYMcJXILLvlb472SNGuA9au1uBg7JquCyrihvAdrRGXwjkRwLDgcXAocC2EvcrM2yn+C79NzAwi4Zba5cGWA2cXUD3B9rAdgp0QYbFaqB9K/clc+wFLCCZujOADq3aowzRG1hC/fX6ERr1nQqVwEoKb1Lz0ejvFBgGrKH4rpxDo9+rlfqYGkYCNTRM1l0rgH1bpacp4Gigjvqk1qNd2qWhfjWaFf8pnARsIp/I55Y+S2Jazgl07qpBltZ/Amche3gbcv9yiNibdn8sCeEqkz0BfGf3X1hah2bJvxpVaJpuBu5GxNcBI5D/uwZoQ0K4q8mrgVHoJa0D7kPm5UbgxJIyaAJuRCPzJ3AKsNSezwEm2f3Dltf3lt4w3THALXb/AXABegFbgYklYdAE3I06+gcwGnjKnp03NMeeD7Fnn/BE0z2NRv8je56EAgGb0ay5NGMOjUIZ8Cjq4M/ItZtgz6uAPYC+aHou9cr5hDug9boO2BXoB7wLjDP9OORK5oAbMmPSCLRFO24O+AG5cz2B39CIHGn5brI8t3tlwwDAc5bn9AJtjUazJwfclU73m4b2wDTrwLdoFMuAmSa718u70GSVniwkfLzlmRa0sx8w3u6Ho1mUAx6hhMGLjiTEFgI9TH6tyT4D2plsmMnmBnWEhNsiMpvIdyTchnaKPQ9Es8md521bzKYBdAE+tgY/AcpNfoB1dgP5kYr7LO+1QT2xmNZky3uRJzsKLY9fgQqT9UOzys2IzHxq35edDXQy+a7AIpNXefnLkIe03eusQ4zwKK9uH/eT+M5uGvcgWSqZ+NS+LzsdkXR42JP7GGPymZH6fkRnbYhlaET39mTtkPuYA67x5OVolqXuU/u+7PPkx8GOQ0fOGur7s49bmQsidXYi/6U5uPP8+kA+GPgLLRvfseiEjrDUfGrfl52KTMFyu/ohzyaH7Ody7+qGjqfNaAcvb+TlpvX8iM4db4uMmJNXeKRb5FN3oGm+7L/l+rIYqWJnWU9gLfJbF0b0w9GIz0Uj6aMCGIKsrR8iZY+2MuFxhZWrQF5TXaArR18l1iLvKsThyP7uHNE1iAoS1y4Gdxb3j+jON92tBcrGdmmHKVZ2dEQ31nRPFihbjZyXgmhTRFeL3tZA6h/wbdBI4KU+9rd0aEQ3yOrrBezexLJOF2tzTzRIP0d0jcbr6I0+SDL9y4B7yF8z/jk7kiS0sw042dN1Jtlg3K7fztNf7el+BAZ4uoHkBwMv8XTtgVdNfn9ziDqM9hpYCrxCch7XoEM/h9b5dOAdku9GL3n3HyOr6BfqbzKrrLMuzLOB5EVvBN4C3kZrPge8RhI+mmdlf/Lq69YSwgd4nXABtx3WgUp0Jt9O4snkgOUkDvs4EovI1TPNe34VOfju+UO0KZUB16HNyemqgcut3pEkRkcORU3cS9gtDcKvIUtmCPJxQ7RFnk3fAvX0RGu3PYppuY72R8bDEOIj0waFbfsTP1G6I6OkA8mLTY1wiNuskZgdOwJN1eMjumtICI+P6C9DzkGPiK4v2t1j1lujCBfbpRvCGDT9QscAk+8DHBzRjQjyhRiFZsN+EV2lXUc0qaceWkK4GDpaujGi8+PNh0X0m4I6UkVWhLtaWhvIy9EyWYGIxUZqvZc3dWRF2HktvwfysdbmbLTLVlD/s0pNUEeqyIqw82dDq8cF1WfZ5cscfgnqSBVZEe5j6eqgrVPRmTkbGRQApwVlq4M6UkVWhAcgYv4IH4Om8AxkgCwFvkYezj5evlWWZvLZNAvCHZFjsBydiw4XW+r/NutFZFBc6MmqkfU1KIO+ZUJ4CCLhf2moAM5E6/NNTz4F2dtVJE7EDuTr9iJu1bUIWRB2xoQfebgOmZVPkv/rurXItu4NnOvJF1t6YNqdy4KwMyYWWNoduX0bgMci+R9AU/82klF2ZUem3bksCI+x1IVv7kGO/mSSM9bHImSrV6IXA/BpUFfJUMx5iIV4uqOw7Tf2PIbkV3ex6IbDAGR51aFoaDs0I2rIH5SxFA7xZO48xDAebVizkGk41dq4muKxppXAneilTEUv7X3kMsZiW81G2oSd4/8W8DIauWeo/1UihodQwPAo9M35jaDOVJDmr2n7ACegnbfK7kEjHf4uuhC2WnoV+nKxBTgPuJn6oeBmIU3CN6DIRwX6EuFwRjPruxJN7b2Q0fJ4i3pnSIvwYNRB0DKZi/7D0NxftHdBRon79HoHCiBmijnodxc5NNVqg2ub6epIAmg70PqLfShrKvZApqcLB9UhXzln7dUEl4uQ1qKXFUWxEf7TGlhfQB8690vQSMwrSqPxWI/W7xRklPQz+boC+d3/nHLoS+P/APgHBXyDyP/o2iYAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-facebook { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAS5JREFUWIXtlT1OxEAMhe2nvQBQ0IBEgYQEB+AAiBZxAERHR4GouAAlFByCM0DFFbjAVvxtQ4FoKOL3qCKFVQonbIiQ5nXjGT9/mnEcj4gZgFUbQSRfMEbhpgpAARgdYPKbZJJvZnZnZk/u/lnHJa0AuEiZRMRMHRURQfJcUusNktxM+jz3vYFLANc9c3+ocw+QrABcLaK4Wb8emLr7x3yQ5L6Z7ZqZSVp298EAvlqKb0m6B+BmZtniZov7DJfq4l31f+YAyVt3f3D395btqaSTeiFpB8BZyjg7B0iedoA9ys6BoZ5gPXtwEABJG9mz6R6QdCBpTdIrgJvmHsltdz9urPeyvp3/BRHx2AJ32MXjL3ogrQJQAApAARgdYGJmFcnIJgCo5mOSKCnt0VD1DVtKho3CSW2sAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-fax { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAARJJREFUSIntltFtwjAQhr+WLkGfEGrEAF0DwUoMwAMTVOoGgAQTVLS0DMEEgIToGw4P2IqxHcwlJE/80kW++HSfL5c4hrhGgALSG20PfAKvN+QOSgKzbQ20igBNAml8YWgZoIE2qwQeA9CPKoHDAHRnB3SAPyfgB3grCIwu+Bf/EaTAd1XAvNda3RnYiQFTZ74scAskT5FksXmpxnUD/+sG8iKMXwEzPe7qxdi+AuaW/14WOAMGzr1rvgd8FgJLS1ph1xr3OW9hRj2yb9f4nqQV2gmPjq8CvidphXMePbz0PT16eHfV3cOrm3cKNMjpRUFNAZaEf75fOijvCCK1DZCgLwuyE7bSsLYGuvNSOwATAzsBp8LAjzaUJ3gAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-flower { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAzJJREFUaIHt2k+IVlUYx/HPlDaJSlBCaYiiIFaSthCCclGKtnHjXmtVuBAU3IVuswhCxFoJLaQ2bsRdGxPSLJjRRMF/E/0DRXM2mqGjjoszFwd5Z9573vvcy8s77xfO4oXn/u7ze++55zzn3EOfEGZhO37F/xPtFLZi4KnYRTiIv/EQ13EYbzaVbFVexEmMT9GOYPZE7DsYnSJuDB83mXin/GBqs0U7gMWmNlu0R9jYbPp5bNLebGHkl5KxvzXqIJOvlTOR25ZEJfhMlNAErwbrFSyMEoo2fDNYr+BWlFC04ePBeqTp6koNuiEM4i+x7+/uyASfLgI64VlswWYsw3K8EqBbMIR/MYxvcTlQO5ulOKP807qLr6S59W18hJ8zrn+APQ34asl8XG2T4OR2DW+00BnAvgydceyqydO07MlMckMbvTIVWtHuSCVso1zISPBcCb0PMvTGpYVINlWmpRUZsWdLxJzJvP/KzHhUMzyWEftciZjBzPvfz4xHNcPDGbHrpOlrOt7PvP9QZnxltsl753ZOozVXml/Lav3pyZq6MQZwLCPJMXzSQmchTmTo3Mf6mjy1ZRD7JTNlEz6PL6Vp7Xv8l3HtVbxXJeGI0pL0lDZJpeUWrQuMTjkkdfch/Cjte3UNL0vlY8673a5906iDTHaJNTuO28pNa6WIXg+vDdaDeTosMloRbXhOsF7B81FC0YYvBuuRdjhHatANYZWUYOQ7fKxRBx3whTizo9IOSlczgM+k+bKK2RG8VUdydfEaPsRqycCwtK3TqizcKy03F+GGtBnwHe7VmF8jHNb6aa5pKoHoUbrr6RvudfqGe50ZZzhqHv4UO0rEvaD1QuCW9BmlHa9L1VfHzKpy8STmS4v/TnmpZFzlHjnjunTfcK8z4wxHDVp/SKfvVio/AOVwTtrMy/me1Qifi9+1fIQFUQlGd+mfgvXgknTGI4Row8Wh0khC/8Row6Pidy672jDx3brrDZ8M1LomeE+6259w5J+HegyPSMf4Iwgf9aMKjyXSCfeC38UcP7yHdyf9Pq3cMrJ2ck/SddoqFyAzrpbuG+51ogato/gnSGs67jRwj97iMc2v6ZJRLbQAAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-food-hygiene { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAgZJREFUaIHt2b9rE2Ecx/FXxULVihaRLIKCq4qDo4Og7goKxUVEdHRxEHFw1cHBwcV/wKW46OriIA6dBJ0VBze1/izSNg7X4DXeJcc9ueby9HnDwZNvcp/n+07uck8uJFrFQdzHG/xGF39wZxzNnMQCrvbVZ/EIjzHX99wlPMXZCvk3sSyT7N9+1e46gE+5Bg7n6ndz9Qe5eger6/Vv2D4g+6Fi0d62UrfpbXV3xP4K405uPJebbzdmSnKv40ZAXwMJEW6CPbJztjHaJjyPvU1O0DbhU01P0DbhA01P0Dbh6aYnaJtw4yTh2EnCNdmZG+/KjXeU1CeSFf/Wtq9wHOfwI1dfli0mjuKFjevh2YLM1wavoYPX0iHkhetsYxEOOaQ/Buz7WfbpbzohwhfwtcZ+XVwzpsMylCN4r/phvCb7+VdGq8/hHvvwvKCporsUF4dkTYRwjytYUtzgWxyrkDFRwrCouMF7Ffdv9bf0RJKEYycJx86WEx50938cPMF3TK0/7shWc60l9Drcz3xJXroOVyUJx04Sjp0kHDtJOHaScOwk4dhJwrGThGMnCcdOEo6dJBw7myXc3aR5hjJq4aWS+peaeWVv1FrNvJFz2f//EvzEoZp5JwryungX2ugouS2T7OIDzgTmLdgou4rzgZkjZ0b2qU4NeV0VpnELL/EMp0eQuXX4C/8Z1f5p4jM+AAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-forms { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAttJREFUWIXt10+IV1UUB/DP2DiWU4oF1kIQB62NqFDEhGmpqDRhVpDpakR0SiohRHDRwtQWMhDughaDQTIgGEIESS0y/yxMHRKEUsooHSYYTXFhxvxxce6PefPmzc/3G39Biw5c3vvd3znn+73nnHvuffwvPInTGMJwHcYAjuLxsgRO1Qk4Pw7lcBqwEi35yUFMwmc4UZZ1FXkFa/A7Zmfm9+Nd3ME6fFX5o8J4cx3AYVfydzkz15Hm1mCvSNMWaKwTaF4GsDW9v4w+XMA2vI5efILmIgJNIleTawC8huPpfRhv4Ws8jM/xADbhfRxDG5bg1YpBNgUfmljRtSX7WenZgk6sxi2R+3aR+z9xG88XReBqDSuvyG0RVriCJ/At5uCpRO4wulIU+hORE0URgBnJSdnRnLF9BOdwHi+l1X+PZ/FbwlqWZV/PXTAZ3yR/x4zsiGH8iKexO2swXhGuwJSSoFdwRvSULizGB9iJpRm9BXhHFOMoyUdgj/KF14e5yW6f2H5r8Rz+zumewtSiFeQJdCgHfhOLks22NPe2OFv6c7o/4bEi8CIClCvC6Un3DdHOPxIH0K858F6jW3IpAmXlBRHqA6LpnDE2SgurOZhIEX6HG5iPI+n3Vnwhqrwi/+A1Uf1VJR+BvcbPe484OVtE9feIfd+V0xvChnsBUxyBP6rov4dpovKbE9inWJ/T24HuMgQoX4Qz038bRa6Xi7adj9LHSe/R+yFQTQ4lkAt4ERczPrpFQ3oIJ++HwHw8kxsPipRdEnWwGj+Lgj0rDp8mcfQeST4nRGC7sWG9lZwvTSuelnQ34y+0Guly7Rm7e0pREU4qmDsqtlUb5omDpl/shFX4IaM7fYx1jQQ68aUIeUX60nMufsFBsfWul/RZEwGidxfJm0a+H8aTWq5yNV9KB+vts1GspkH09XrcklvTc6iswWn/zpfRcSVlnrgsDNYJeDCBj/oE+8/KXT9rPFy/zcKzAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-gym-membership { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAU5JREFUaIHt2K9Ow1AUx/HvvR3h3wPgQSOWYDE4EiRvwEtgcOBJQGIml1lwhAdAIUiQILCEJWAQ7UGwENKWdrvbpaT7feS5Oc35pWfZTUFEREREREREpG1c0wNMYR3wudoL8FrVVBd4A/xusZz1gLcJhps5h38HVn/WDI4gO67q61Q/Nuk67CxfNbik4cAV1iDZLpbTa2DYAXC4i/yx4fvRR4si2XTYIF816AJ3ozfsDoqNdg/uOfJ0fy7/o289BW47BW67mv/hcg4/AD5mPMuklkOaggIDW4F9jdNKj8PgkK+LemMcnAOLk/YFrnTWB57CemfFnxIQeO5WWoHbToHbLvTi8Z9llN8CDb4D21Xx3D8CC9HGiia9MVj67bQDYNheSSOQ7Eeba2p2C24lV6z9QlOz0ukDuJOSg+H4g8Vh2M5oS0VERERERERE5twncmQ3JnNXdnAAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-hamburger-menu-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAWCAYAAAChWZ5EAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAOJJREFUSIntlCFOg2EQRGcmNVACAcENwNIz4LD1JJyBgEaD4ggoDGhsL0EafgcOS4Iru4P5N+EES0Wf+tybTb48AoDtWWbeSNpHE5k5kLwmAETEIOm4S/5nxJ3G92G3fOSA45Jz2/cA9hrlS5LzRt+GNYX1yMwpya1G9xfJVckvI+LHjUTEZ2aeVIi+JU0br6/DHypEH91yACD5XiE6sn2FxhCRXAK47fJtWF8IALa3bc8B7DS6B0mL6sCLpLNGOQDA9kUNWEmadA/IzMcK0dM/yE3yuf7AxPYpgN3GDW+SXn8B+3rPfSAz/xkAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-hamburger-menu { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAWCAYAAAChWZ5EAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAMtJREFUSInt1j1OQlEQhuGHn4B/0UjhDqxlByQuwQ24AwsitTUbsdGaxsJNCIEOGmNrjQkWMAkNUN25kPAmJ5mpvvkmM5NTsaSNF1zLY4LeerIo4fWrqwJuirK5g1ZtFXyjg4Y890M8FWzwyAFQWYvPcZqo/Yt5JF38yb0BP7iLNfxAsyCnm7jASRyiWbJ4MI0ZuMUzrhLFR+gn6h3ZU2IIz/BguRpZTPAZyUA5H5LH6MAc9YKcbuM1DtFbCeILvEcH6rjHZWIBY3z9A5Udht2TqDocAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu2 { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAiVJREFUWIXtlrFLclEYxn/pp20XHO6FKyiEglOTg4M4hdAWDfkPNOpmNDk0CA42uDgZ0VY6qQ25JEZg6ODgJihhNBVdBCe94vmWD+GDzoWvG58NvnCW97nw/M4573O4W4BgjeVYp/kG4EcA/LISnU4nHo/HtslkMmGxWEh1IVutVkt8R7XbbamH5RX4/X7buwfw+XxSbQuLd8Dn8xEOh20D9Ho9Xl5e/h3gf9TPTkE8Hmdvb8+2ycPDA3d3d1JdOqEfHx/fkoLpdCr1sDyBy8tLDg8PbZ/A7e2tVNsM4c8GqFQqLBYL26tarUo9LGfg9fUVXde/vr0/ZRgGqqp+qlmmYH9/n2g0ahvg6elJqm1SIAVQFIVarUYsFgOgUCiQSqVW/VqtxvX1NYqiUKlU8Hg8eL1e8vk8uq5zfn4OQCKR4ODgwBLi0ydSVVWxXC7F/f29iEQiYrlcilKpJFRVFc/PzyIQCIidnZ3Vd/V6XYRCIdHpdEQwGBTdblcAIpPJiHQ6/bUfktFohKZpXFxc/BUlXdcpl8ucnJwAMBwOmc1mnJ6eAmCaJm63GwCXy8V8Ppd6WAIIIchms7jdbm5ublZ9wzDI5XI0m81V7/j4eHVd4/EYh8NBMpnk6OiIRqMh9XACZzLRNE2urq4ol8tMp1Pe398ZDAZsb2+jaRqaptFqtTBNk8fHR5rNJm9vb/R6Per1Oru7uxSLRfr9vhRgE8MNwNoBfgMDNbIQExvxdwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-harrogate-map { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGoAAABRCAYAAAA6nDP5AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAGMpJREFUeJztnXl8nGW1x7/nTJJubKXNpGsmk4YiVRGtF1TQ0nsRccNLaUEpWdB72VrgXlCURStXFAE3pC0WgWYmrN1YRAFFWVoVhepFNiltJpNumUwoZWmbJplz7h+ThCSd7JOm3o+/zyeZeZ/nPM9z3jnv8zznOc95zgv/ANgSmTRuuHkYbshwM9AVybunTqIlZ6Y5MxGb6aYzBRunLSPH5//Hq28PN3/DhZzhZgAguTz0Hg/o98041luYCCACoIimP33E3k8DK4aRzWHFkPaoRLTo6w7TxWW9q/2lKS/1fOGZW/Z0pElGw/PdWIYyBsBgp7qvx2U9AV+PcSIiFwCY+y9VZDfuLwbLa/5nKHk/0DBkgnJHklVFr4FMa0szI6XYK6iud/xlXD4twokAjj3sqlcWzI+9KIK3lUlUlkwTTW3MwPip+WWxXwwV/wcahkxQicqik0XlsdbLKtyOMdcZqgS6kDbifnF+Wc1tHQXUEQ2V4WMNG4fI59t6F1CnEjhyfOnGt4bqHg4k6FBU2lBVOMORSgCcaLAsVhYsjx+d2tt4iIl91GEh7ssdnjDjuGB5zc+7ExLA+IrYn3e+mfs7kA+2pZnbqFQqdfJQ8H8gIqs9qj4Snu7i5wlyKYA7T2pz3qnZ0taSd0+d5C05W9uu3bk1z+zrY8+J78xG/QcyBi0oXzYzt37Eji+I+PmI/Ft7uvPQ3pHNX+yqPAwWdZHQRxFdp62jgRmlEypid2azjQMRg1LPE8tDx9QHGh4UtBAEjD2I3ysqt+SXxp7raTgbKCaUx/9YHyk6C5fbUcaI2oDuwRehDUWh6amcwOTcZtkw7subNmeb12xiwHNUXTT8SQ/wdFpIAH5JXm5qcrC85sv5pbFnh0JIbQiW19yHWDWASGDvQOpomBb+rAf0FXV/PJXTcoc74o7UVxV+KBGdVpJdjgePAT2NiUhRqZvdoao5Dve9+UagfPolGwf0gw0EG24qGYGnihHQVNPTA6nDnQvfHfj1pGQktAFRRSjG7SHgC1ljOAvoV49yRxKR4m+ISFRVc3B+ENwUO2t/CgngkMNSH0cZg/H8+Iot7crF9mjBmO3R4vclq4qO7Kl8/V3FRyCcAjQiXAWAaglCMYAIp26PFr9vKO+hv+ixR7kjDdHwlwymAyQiXKzqY81wVf+vYHnNT/cPm50h+GdAQP0RAH9iVk6ytvZ2M0pVXdyF+kjRdfmFoW/J7KdaOpbdHi0OWrP/SRUw7s0fHbs+2RieBVSL2H3m+kWB8wKkvg6UDsPtZUS3Wl9ixYyD2LP7ZyIyv0tWo7vMLyivXjPEvHWLumj4FYX3IHwiWBpbm4gWfUCQ/+1K5/AEKTtLVA9B+DjGCSgV6TyrhZx/Kyjb1Mnq0VAZPtaUPxlsnVAWm7KfbqlXZOxRDZHQUanGPatF5Cg3a0L0D8BTAK726ISy+DP7lcsO2B4tGCNmxajiJvmJypJpeOq0tkfOjL8QkMvVU/cIOpuAbm8v3DrQG/acip8aLN20fZ8GAoFteAqFye7IUCpF/cE+PSoZCZ/lzq3pOcBelIDMzS+teXU4mOsO9ZHwpQg/3CfD7QUL6PwJZ8deaKicMtk05z6Q44E6YC34OtzX5hcWvdB1SGzDG8tDhzUHdCswGviZSuDrB4KZql1QG24qGXHYYS0/7mBLizTvabxw8nnbdw8Tb93CF6HJaaHHQE8CdoOtcZOqYKzmcbkGa6dbNjO3fsSbhcHyjdX96Rn1kaIzEbkXwAxHeVXhWXd/FvOVBefE64bgtnqEAGxfHiqSACsV/TDYXtAF+aWxOw6Ubp8JDZVTJreQO1tGj3qg4IyX3+lLmYnnfm50bl7exwTJdyRhufxxy49XZbScJCJFX3PhTPCjFc1tS3fj5Zbc3FmT529oyNa99AWyPVowRhi9ReEwjJi7zSk4J77PxPwPjXnzAoUFfoU7l6twcFuyYW/ict3m8e+7kWuusUxFY8tDIw/K0feb8S8iLGkt+bcWlVMnnV0T3z830NqjEtFQXNBCzGcFK2oGtIA8kFG4cM49gn6xewqvii9eXdZbPYnloQkirEW1BNJapTgPAw8Hy2MbssZwBiiAwNMArnL0UDY2HChacHp5FyE58HpnKikNLTz9S73VVXBOvK4lR05y50kzUgKzEX6I+K+yy/W+SCusLk8DCNxcFw0/WRcNP1kfKTpzqBvfH3D8ovYLsxjYjPjiVeNTmno/xpb2rI50PWDS2TXxgvLY7JG5qXycq9OpMs2fmDWk/ifpHmW+tkPCLIVZuFzny2bmdl/0HwCLZuXgvLvZqPrt+OI1fwfY8tP7XxTl2g7UH6Yf2z6Hza99I9dsCVgSIBmv/W622M4EBRhfEX9VxGaL2GwTOak1J5wcvaN8KBvfL9B3NVdx29Uxy/BdHS/6W/XYc+I7cZlnRgrl8vpoeN6geO0B6R4leH5p/Mn80viTE0qrfytO2myU4mpfMSNvkG3I1AVfnFRw2dljBstsv3HNUy2OPtd+7VxectH8QwAKLzhrrOOXtWUp+ifov7CC5TVPidjydP1+3qB57gYZrefjR8Xua80N1TU2Th9o5UUL554ZWjhns0rL1pF7d785deHpdxWfO+/QgdY3ELhzT9t3UT222ffUFC6c+5QHGmOKHtNOKH73gNtA7xskm70io6DkDFLgLwEE3AbkTlx00eknO9wDOrm1qYAiZ7Xk+n51otSc5ghYhwWxjhX4hKLtD4wZO3e7HtDb+T3sR/lfWz/n7pPTByXDTC4jPTmv3m1ysDkng6VEOLlo4WkfGCjD/UX8pgd3YrK0JxpV/2ly6co+WTeGC90KytEHABBdmKgMPZSIFJ/gjtRHij+THNHwckNV4YyeKnbxqelP7k0uXfnO5iWrfgMaB0iJFGbxHnpFU0vejWaW2bBqtiPQpD/an/wMBN0Kytj9qMPPwfaK6udFfG2yKmyI/xLVkhYL9DhxqvuzAG5cFlow96Ohhaf/N1CMmWF567N8Hz1i+633NKjK9ZkZ1e9V37ryzT5UI/kXzjsou5z1Hd0KamJZYldBWexcy9GQw3ccdnQicKvYHi3oVpMT53YAFT6C8AeQHwGY6qObl9y7LUv89x1vH/Qjg862OeO1MePk5h7LLZqVU7jw9O9NXTjnjdHqb4cunFMdWjD3rKFkNRN69ZmYcFYsUVAW+5axu9Cxc9Sap4CtU9VDAj6qW4Zrlq55GuP3XdNFfEgXht0hHok0Kn5pl+SLX75mZVNP5QpfH/9TQa5oVz5Uwwh3FS6Yc/pQ8ZoJfXZuSfeweOX4ii1bkUB6cha5NVkZmt2d+cSQb3RKcH5Re/PqPwyG4cEgvnj1GoO0Xc59VXzpqkd7op947pfGC35u6+UCTCaCV6WL61XvUvqQrxEH5Ne3c4euaTOduOrvkptr6+qjRUu60m1eunIdrWeazKxJCXx1UNxmAQGzC8G2eq5d3Bttbm5jIWgAsz3xxauWxpeurMPllnSuTQOoqwwfrS739FRPNjAgQU2/ZONeRz6Jc71hG4BxIBc2VJXs4wySauZSc95WkRtiS+4b0q2AvqBm6Zp4rugHa39y/77+El2wd+SYVw1rRHVU4YLTv1p4wZxihP8CENX/BVDx81FGAVhA/nuo+B6wp2xBWc3zwfLYNwpK4+8x4y8AKWuZ3ZVuy7JVW1WsjHcOGpa5KRM23rwq2Re6xA/v3KWeHhFE5EYJ6CbgDAB1vwNA0DsAzOytgl2H/32IWB78sRsRXIW70t/fPSTQEfHFax6IRyKNg21rOGAuN2DWaffXID6uedzdAOPLqtdj9qKqHtIwcsfFr98xberWu6aPz/bOQ1bOR7n4b1u/ltfdHS7IRp0HCjYvXf0SQifzUsB90fpbb22G9IOK6HIAF36QyrHa3FRzMjHy9fuzyUdWBBXcVPMCxvMA2my/GcZwA9OBOaQ9XD8DTMhGpakWvbKDvfDZmiWro53yRe4E+xtmG83ZBqAin01Gw5/PRvuQxYNs26PFQfHUOhU9wvD1b72Rc/x+8klX4MvAV4GuPudO2s3gf4DfDaaR0MK5l2F2g4kct3nJ6ud6ok1Eii4SkZ8CNY0jmmdk44xY1o6GTiyrrlf0+wC4H3LExRt7XEhmCWOBx4Gfs6+QIP0gzgJ+C9zEIO43Pi55k6uc35uQAIKFoVvA/gYUjdib+43e6Pc7EtHwvfXRsNdHwlf1Tj1ojAaeI91r+vp3637gC4BEpPiE+mjY66OhxkRlybTeS/SMrPWonT+fcrhg/26G5yBV2aq3B9wIzOxnmf8EunfamTcvwKJFWflNCsqr1wFVoCNcWm4abH1ZmaN8BYFkY9FTIMfjPBosj306G/X2gDDwGuwTCqEFeAzYDHwIODZD2WrgCEi7PpdcdMqIJhtzkYhUYHYUihu8oOjP4wlZxsqVqYEymfZ/z91iRmpCRWxQXkpZeXqSjUXXghyPscuw/RFR5Wz2FdIO4CPA54ALgONIKxld/SCKgY9D2m+i2Q9aKyI3Au9FVdM70XoMsCSUb7+eeO7nRg+UyXGhaYmBlu2KQQsqsWLGQYZcbkYK/DMTyuN/zAZjveD4DGlXAF33uZYDmexwxwNIoCkK/Eu3raj8a25e3uIB8phVDNppMPjSy7sTxaG3VfVQFdtfjvOTM6T9uhvaR4Gu2zFTwgvnHmvp3geAOc+o2PWePhBwtcDRAIJWFF4w59raW9ZUD5RZVQKJyqLbAERlh4ivM2OviCyyQOrsCfNre6178CakazBxWQ/QkgqsS0SKTxhsnX3Argxp3Q1RmbYgdqXwT7Vfme0YPbrp5PjiNQ/ULl61Mqcl9UnM2tY+ogH95CD5RVS+IipfAb7mLg+KyKPARzUVWOreu66QJa0v51zH/qzKWBFfWxcND/rGesFfM6SdkyFNgUxOpH8BDu9A9sqrNz7UHl2m+mf315tKTdu1e0fafuDJpwzhP9v/nMuAG8HWdaD6VENVuNcd46z4SxdUbNzky2aekBy1owlAsMm+bGZu3ag3xk4sq67PRhtd8Cvg/C5plwL1pBe2TaQF8RPSCkZHtACPKXJIu5ahfHDKeXMnb1m2aitAaOGc94BP76AUD8gqnj5UF7stU54vQuuLw+eLsMTNvg1pw3Z3yNo6Ss5b3wxEAAT998TIhpfEUpkm/WzgMaDrVoUCN5DW/jYA28l8qv0RYEfKc34B1qZ6j5Zcfl+4cO7loQVzrzKTJ0HTWqXZrsaRI7ub/wYMuQbLSekvAFy11x6b1ehi7t7WQ7+gokcgOlShRZuAO7rJG0N6ndSdK/YygM1L7t3mpu3x/hRCAtcjXKsq7+4AiN6d+OGdmebEQcNzxQEEDq+LhDbUR8M3bLipZEQm2qwKSkQ6HWDOcYbykPJioLmfZf5Om88EIMINPVKbmRL4Qf9Z6xuamtiL2YuGNavoEcDXDjs09aeGSOiorrRZDQOXiISXIf6OIGcBExA/M1hak9GFufj804ItOYFrBDsJo8lFH2hubvzu9lsf7s/h7ttJL2r7inKg0xZF4YK5j4mQOe6fcWd86aohDwriK2bkJXbv+qyq3AgyDWMPykXBstjtbTRZ7VFv7gxcXFBWc5m7pxeZzveStx15cFe64nPnHZrKkd8LnA9aguoMEa7MzRv5SD9tbd+l771qI7DPQQBR/wYZTnGYWZMr3+oHLwOGnPFy04SK+P3umlY8lFHgV3Skyaqg2vaf3tyZc4UZr4JM87ymfXwlUnlcAFpi5gl3m+vwH4Y1Cnwi1PBSf4JFVZPuVX3BItIaXyfEb179V3eP7EMtcnPt4lWxfvAyKPgTs3KEVLu7guOdtvKHJFTp9Es27hX1NrV0Hz9zJ/UBABG5vXbJmtW1i1fdri4PAyB+TFf6XnANmRfAHfFXMpuSWpvUKzr6phtWN0JH7rco0MnK0OzE5toaF2k3ZwnSaaQYEkEBOL5PZOV2JlzSeW4nlVw0/5DJF502BZePpMvxWj+bqoNelAL4Gj0cUosvXVknKt9su1bXyzbefNd+idaSqAzPTSmPKUxundvT0axNOi2Ch0xQYvK57jM97bWkeuxe39OQk5I4yhSwd0aNan5wAM39gPTWRiY8SHqHt0fUjnvfYuBZjMfjS1YN+FBbf1AXCZ3vsKIt4Ig52wz/leCfGV8R+3NH2qyH0/ZlM3OTI3d8DyHtFeu2OFge3+fEeWjB3IcQOjt/uN8YX7L68gE2fQbQ9eRfI/Be0nNZr5iyYO77VXhnf8xNieWhCdIWUMv9uvyymqt6ipST1R617c6iUHLkjqcRvmpgDlfmV8cvyUQrkvpmR385M3urmVTmozF9wwr2dWC5nj4KCWDLklUv7C8FouCceB3GnwBQfaG3cEZZE1SyquhUbZG/InzEYKsKJxaUxa7rGESqI2oW3/88yPK2axH5zrYlD7yeibYfuJC01QJgE/D9QdY3pHBpXdOZ9xo1ZtCC2hKZNC5ZFTrRXR5UZazBI6lA7jHB0tja3srmBuQKzHYAL+U3jxu0XwHwKnBd6/cLSA99Byya2XufYc0mnFxfVTixJ9pBCypPRrzqrk+0XRdsin2ur5G3Nt68KokGLnPxc9s8T7OA7wFXA7/JUn1Dhinl215X9GEFxQI9hvgZtDJRHw03AOMA3Px3BRU1Gf3P/7/BV8zIe31vU7AllTo8ELDDSSH5FfEnei/ZGXWVodNUdQ3G88GKWLdryKwJyuE7wdLYogM5xt9g0FBVMsU9NSvlHKvOcY59UFQ7WejduTZYFvtWf36DDTeVjDh0bGqbwOGOH1NQVvN8JrpBD33uLAYQ+GZ9VXjZYOs7EJG87ciDWzz1jMOdKlyMcpyo5mH2Dtjf2s43i3B1fbToh91trSdvO/Lg+qriL9VHw2vqo+EV0GrFwe9tJenWAJyVdVQiWnS5INeDb8L4sqsXCxIyl8MDwuNvvBH49f6OjZ5NJCJFPxJJH1JzuNJF/pw3gucOP6O6/TR9XWXoNIF7W3vZjcGyWPt6sCESOspEvwt8GhjZlt7Wg7ZHi44LIM8AdflTC6dminebFUG1vvrule7y3axJVB8xt0cDKk+M31jzWndq+4GCdBBgTjHX03DmodaC6YcnVMT+1l2ZZDT8eYeHAMxszoSK+P0Aiei0jwn2+9b0tager6Bu3FtQEfuSO5KIhreoMMmxTxeUxfc5W5ydHrVixkG+e9crqjoFwPG7BWodCYvxHpTOkVqMPahXgzznzp9NUo9MLKvdb5bqnlB3V2ExqcAdGCe0vZTMwAQWFpTFbumtfFsEaTN7S8j9UEHFxk07VhQf2tLoOwHypxbmvr5l64QWb65WNBezelNq0/F8AfySYNm+gf+zZkJKm45evwlkY7A81ikSyut3TJuayrVPYX6KuXxMlc5rBicaLI+VQ9o9uq6xYOSE0sTu4VBMWsNpv9HK2O+BFZKTWpV/1uY+xcZIvxYjVKuqU3C/LlhecyVAfTTsAOo2Y3x5/JVENHyrpH3h22FYc47kjs8Uvjvrtr43locO6+3FW4kVMw7SvXuOcudrwDycZ8xZotgtqB7UyvQGgeuCm+LRvg6T9XcVH6EtqZzx5fHuh2FH6qPhHyMcDaxJNQfum/SVjZ0cZeoqw39X5Ugx/XB+xaZ+R5mpj4a/AtzW9gAmbzvyYM9regsgxyV0eHl17Y4VxYfubWSqplI5qJ4uzmWo3xQsq7kiU53D+h7e+qrCiXggw5Nqe0E7OHnY47hsdtG1OS3yeKZ3PbUdHjNnW44GjhtfunHLlsikcTme+wkVeb/DdBEPmVHUNkRD65aC8lvH7xqxt+VhOzQv1TZMubOgoDzWY8CrTEhEQ6cI+gjuvw2W15yUjIbnO9wJti5YFv94xjKVJdNM7e3u3OuG9T28+WfX1iWioddaHTswsxYZPWZscN7Lu5JV4bkGP1aYDHoSAoKfk8px6iPhaocXXbxBXardedWFnwigwiTz5l8mKkvmiLREEEn7mZP+r20LEuN5E98CcgpwsiAnN+bmuja6tObvcbUBhQJy1a1iYC5T0lUxPV2pbuquTEHFxm7zYJgFJYL7E0Uzkptr5oJ+XVXXBtuDzcdWbl028ZeMGTlNUj5JVGbiHGswS4VigWJJSw9Jf+CwzLHZih6dfiVs+ws7EqheJWbVBGSbjRi9tS2o/fZocdDxeeJ+GsiJQMDdntWAlE4ojQ/oVRcj9zRvbRqRiypHJqtCJ7oxAgFP2yIH9lsNtGC24Y7UVRWMnliW6HFb3RehiSPC76XFSgIq+eYyQ8TGmcuqgrKahxJ3F4Y1Jc+YMQKV18TkNQ34t/vyfpEtkUnjcsg7oaBx3K9aHUoHfC/JSNE6VD6WfoVT++98abAs9uOB1HnACCqbqL1vyqipZ2xpHE5zlj8xK6d+c+03Ha5ue3HmQOc8+H8qqAMJiUjxCSKpS3ARU71lQml1r24B/8Q/8U8MNf4P14w4vGC2NHQAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-health-and-safety { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABTtJREFUaIHtm1lsVkUUx3+t1FZJFdBiSl1aFzSmEQJVEJUYNbgkWLEmrrgENUZNUILELW4PJC7RQAIaFx6MxQeXiBshhhAUN4yKRlG0uBCVVGNatBZF2+vDnMu93/3uMnPvzC0P/JOTr9+ZM+ec/5e5d2bOTGEvCmMM8DHgRaQHOHEE83KGC6km68u7I5gXALUOfO6b0jbBQTwjuCCchpqS41XBJuFO4B4Nu2bgSWCcxdjasEG4DkXgFeBIDft9gOuAz4HpFuIboSjhBuB1FAFTtADrgHML5mCEIoRrgG5gVgEfDcDLwIwCPoxQhPAi1BRUFA3Ai0CTBV+ZyEv4OOABi3k0A0ss+ktEXsKLSZ9v8+BSSliJ5SF8NHCB7UQECx353Y08hOeSvoDwUtqGM3x3Ao3GGRlglIHtbcCZwNQUmzbUxuEvYHRM+xrg8JT+9cBbQD9wFdBrkJ8WTAhPAs7OsJkJnIQa9sdSORIGgW9Q83Yapsnnfga5acOEsC66gY+AbRF9HXAKcJCDmNpwQRjU23aP3Pua7F6mA62O8ojDa6h3wV4UQZ79aStqG+hqL70RWO7Idy6sJ7mEY0tOLY1NBlpwT9YDlrkiYDosD3SSRTXGunJsSrgH2OEikQg+KSGGNm7B7XD+kfJGkjbmApuxS3Qb8AxwaIk8jHAJdglfVG765mjFLuHDSs0+Jz7DDtm0l9Q8YCdwhRMGhrgRO4RvSPB/MNAnNr+iDupGFPXAdxQj20NyfeyJiG0phb4snA4MkY/skPSPw+SQ32Xy+S/Q7oSFIW4iH+GbU3y+LTbr5fsL8n2t/fTz4RrUy0WH6E6xT8LFYvcfqrQEqhY2yB42hU1EHaoNE090GFiFqnclYX/UIsSjept4r+h/wFHNSxeXocj6aEUN8+WoGtfjqOHbFrJpB16luopyP4rU71QfqTYA30v7fTYSz4OFBMP0QbJP+Y8AlgK7pN9PwCHS1kbwWCRNVV3SPii+jKBT8WgCTkDNgVH7k4EFEd0QsEFkKzAAHAAcgyrjTqNyl7YJVeseRp0kzono4rAWOEPsuzQ4aGEyqnCe9DzaktMk3lkhXVbFox01RXmow4HC6AL+cUAuKs9LvFHAl6JbKbrjUWdYUfEPA5aK/RcULDdPBf4ugewAwVZwfkjXIroFCf38dfcY4DfRzc9Lthb4tASyHnCXxGwiWC/fGcol6b7XSyGb60XXR84D9Tklkd2KWoeDuhDjodbUvg5gSkLfx0I2tQS3/p7KQ3h1SYT98+UpBOvl8yO5jEvoGx2+M0Q/BHSYkG0kmBtdyppQzA2iW52Q046Y/p0xds9J23sYHC6cUwLZXaj7IQCXh3RJS824AsOkGLsJwJ/SfqUu4btLIPyoxBqNWmF5wCMpOa2K8ZFU0bxd2n9B8xZBt2OyvaFkF4tue0ZySyI++lJs64Fvxe4hHcLvOCY8T+IcRTDPX52R07WonZEvSc+6j9lkPya7scUBSV82ErxM/GH6AdkvmLGoulZY6lN7wJviP+vHodcR2WGCS6SzQjqdGwKbYvxlbf4nEsw2s9MM/3BE+FnxXwd8JboVGmQhH2GAh8U2upipwIBloh7qR2wW/7eKrh8Yr0U3P+FG1AvRA+5IMuq3SNSXReJ7fMh/dP+chryEQd3z8qjckFTA/0VsyRaCevPTotuMGtq6KEK4Bnhf+qyMM/i6ALk4OU/8dhCsl4vcrc6DDoICRlVRwV/X2pA3Qn7XWfRbRD6EykrBTOzdzBkK/b0dVV8eyf9o8YCfRzD+yOF/byXsskEsazsAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-health-safety { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAYFJREFUWIXtlrFKA1EQRe/MJiiCCmIlogh+gq1oIaQQIR+hhQj+gv6FfoaFRRC0EdFKrCytLAKSRrAQ8u61yKoB3eTtRngKnm558+697Aw7C/yTGBt0SHIMwK6k2QraNLMTd7+tFq0XYF8jEEK4H+ZRG3RoZjN5kACgXSL7lLtPApgaKUAf7SzL5mPdJR0COIiprUmaBrAs6cs8kJxzdwCok1yJDdB3b1xSsyDkk7tfWQjhwd2XYsV/EkkNT2Wes+AJzQH0ZmAnof9lDcBdKncz65gkpQogaSf5DFQOQPJI0pakPZKvVXVGaUHdzLoAEEJouXujrMBILXg3z+kWFg4hdheApACcA3j5Jsw1yS56LV3PF1EcJVbrcaReM1aT5HZ0C8zsMTJAVN07ZQJskBz4aiVlRduviOgZALBmZs+SQDJkWfZxN4Rw6u6bAJCv4Wj+7IfIJU30PQ/99SqiTAs+3d2NZEvSBclFd1+tGiD1Mtp2kmcpzEl2ANyk8P7nd/EGP8g8TQsfIxkAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-homes-property { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbtJREFUWIXtlDFrFFEUhc+9TEQRxEAKFdEmIJpCCwsbf4GBtIJaWaSwkyAIInbWaqGFYGcjthJtgk1aC0PadEELg4UQEM85Nrsyzs7urBNnNbAfTDHvzrvfeTNvHjBlyn7F9lGST0g+knRkonJJN0h+dg+S25KuTkJ8luSah0DyraR5ACD5lOSn8iVpua34EMmHJL8Pk5dC7Eq6T/JdTflBG/kiya0m8ZgMBCiGiW2fkvQ4IpYi4o+Dj0vWiGck3ZG0mZlLnZnrkHSZ5MZfet0DkFyXdHpAbHuO5AuS6kpeCvFN0ortor/qmyS/dC2uCfJB0sXC9jkAryRN9HP3WPhte0u6HhHzXRptr2Xm+/59USmuRMT5jgMcA1AfoIqk1xGxWmmw2P89Je1GxG0APxqktzLzQl1tZICIWM3M55VQBYD++bCTmc9G9QAAkpcA1AYYOIgmzb4PMO78oc+N3AONXTOPk9xAwyYEcKZtgJmasQOVEAsNPUYyNICkHQDXSF4pj9uetb2dmSf2Iv4VwPac7YO95uUVv4mIu3WTbC8DuNfSeVjSSQCIiK9B8iOA2ZbN9srLf+Sd8h/xE4UhvAz8WswRAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-hydro-swimming-pool { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAASCAYAAAA6yNxSAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAgRJREFUSInF1VuITWEUB/DfcQkTk1yKlAd50EhChEJKiIgHJXmQFHKJJxKlXJ48eKF4mBpelKKkTMLkEikSL4PkkuQWzZhpDGNmPHzf7pzO7H3Onjz416rTWt/6///n22uvPVBlFDAbW3AcI/CwSs8/YzQ24Dy+oLcsLmFkFY4a7MdTtOItzmJSNfEF6E4RLY/Xws2kYWwUTutrx5JKBg7kEE/iF/akcDRW6WvF+CwDVzKaPuJDRu0yhsX+WTnNH8sy8BnvIukhrCxxW4sLGYRH4pm9OQ3cTRMvCANYDdvws4ywUxiwgzkNPEnIBpQQ9+JbDgPX8KIsNwQnU/JZeJ7zXB+sR4vsf7YWXyvUk1jeX+HhaMhB/BLr0FPhTIPwuHNjDl7lEE9iH1bhfVm+E0cxqD/iC9GEthShFtzBfXSU5NswAYOxCJuwGqP6I1yOmui+B3+EhTVU8SprhSFMFtSKmB+gMgpiQxPmlxSW4gG6hFeuETMwE9OwBo+imQ5hgdVhLqZgI55Fw+24qPgdKGArmnGd4tV14QROSx+iTmGD1afUkj1/WPayahH2ROm2vVGIP/4XbhKu85O+jt9gmfDuf0+pN2MxNksf0seYh+36bs5e3ENdMkRjsFt4hj24jVP4EevjsEv42PzGLZyJxDAROzFdcWbq41mYjB2YGs1exTl0/wUotBD7PdpcoAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-icon-bank { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABcFJREFUaIHlm01sVFUUx3810qlIi2hRauMHbW2rC0xMlMZEF6wNpjSBlag0wY/UFBZGlKAmLowaw0IWGhTc+IUuhBjbVONGozVp0KDEtBYUBT9ApV/TSu0wLs5M5s155828jzttlX/ykr7bO+d/znv33nPuOffBBYaqCspOAbcDa4F2oBVoBGqBZbk+U8AkcAoYzl2DwBfAuQrq5gx1QDfwETADZGNe08AAsAV5QIsO7cB+RNG4RpYyfh8yQhYcTcABIIN7Q/WVAd4GVidROO4cTgE7cldNiP7jyPwczf09lWtfBlwGNANtwPIQsmaAZ4HngNlIWsdEK/A1pd/GLHAQeJBoQ7ENeAg4lJNRiuMw0JLYmjLYiKyqQUqcAHqBKxxwrQS2Az+X4JsAuhxwmdgGnA8g/g1ZnZdUgLca2AqcDuDOAD2uSZ8OIDsP7CHc3EuKFcArAXpkgV2uiLYFEPwB3OWKJAI6gbMBOiV+0xuxh/EICd1DQrQAxw29MsCGuELbsBeor4Ark+nrBKuAI/j1GyfG6p3Cdj0jLA5j82jAftOHkcUuNJ4yhPzJwg7jINwAjOHXd6fV2Yq0moCjFEdQWWA98IFDRZuB24Brc1wziM8dQiKybARZXcB7qm0GuAn4sdyPD+B/WnsikJfCRcA9lI/UjiIbkijYa8h5q9yP2vFvBH7FjZ9dgWwbw24Wro4o/3LgjJKRoUxou98g7o5IbOFSZKiGNfZYTJ6HDVmvBXWuw7+fPYGbcPElQ5H89Quyqn5HIWnwekyeFJI98cpPU8iwFKHbUKY3JrEX1wFzhuwh4BbVdwmwDrgzAd+jBte9Vkc9v2Zxs+t5wlDgJLIPrgRW4X/AfbpTCn8O6qAjBfrwG7zDkewg9OMf1tUgbgIku6gzF76nEhNNRttnjmQHoV/dLwU6oGDwWuNHnzgiX2q0/eVIdhAs3YsM1k5+HImbXeBvo+1iR7KD8A3icbxog4LB2jkPOyT/3Wi7yqF8C1nge9XWCgWDG9U/Rx2S/2C0tTmUHwRtQyMUhpbO7o8nILoGeMBz32z0uR9xHxongZcTcHsxpu6LbNQp0ecTEHXgd0Nhr8EEvBq7lexzUBjSFwzyBk+pdjP2/I9BT9MJKMzhSWT7lkeSsO9b4FbV9iaSmfCiE5mzXqQT8GpoGya9N59TPN6/dEgM9j640mUSnWT4FApDWvtd125jzmibNNpcoQr/iBqGYIOX49boenU/iWQnKoU1+EPaIoMtd7DOEXldTgEvPkYS/JWCpXuRjSn82Y5Djsh78c/fOxzJDsKA4ktjZG50p1mkZJkEDUg+2yt3b0KZYTh1AuBDq+MW/G9iewLiWmQYeeX1I6OpkngMvx2bgxTUw/onIpYscmhGEnOaOI3EuGGv3RF5a5C0spdzihKB1D5Dya0RSe/D3WmeqBuJRwwZJadQK/5E/GmKo7ByeNUgnQ+D6/GvF3OoAEdvHkaAd1XbSuTUzGLHC0j1wYt3UPtiq5i2GqntXKLaO4H3QxCvx59vjoshwhXwNiFnuLyYBm5E1qGy2IV/eJ1lHo4JxUA7shPS+j4eRUg19ip7DDtTsVBoRMpBWs8hYpSIWrCf3BEWh9GNyNTT+o1h58JDoQv7HOVx/LuR+UQ79pvNAHcnFd5jCM4/ydgnZhJgE/bIyyJHHZ3gyQCCvGPX7qASqMeuX+cv80xHEvQQfEz4DFKMrkScXINEUDqo8A5jZ29WYwOSsw56yqeQ+qyLRa0B2Qjo2FhPq8RzthxasF2WDun6kWOLawh3LrsKuBnZoQ1gF9G164m8Gsc9IF6NvMmd+CMyC9NIrWcUeSv5fFYtkl1sQVZ9q9JoyXoGeBH4J5LWDnA9cjRoPj4BmAPeQI5QLDhakdMyadwbOoV4gsUY1rIMOUDSRzLj00haZjOOqyCV/FCrGimsdSApX++HWnW5PhPYH2oNsgDz83+JfwEhdRN9/qsEKAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-information { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA8pJREFUWIXNl0toXGUUx3/nm5mU1urcjEkWksxMOgFl0I0TRBTsLraLUlBKoWTRhYgP8NFuXbpwIbTWuhBE0F2lRQULTrMquLIdRfBRITOTe1sa8rCZiTTvnuMimXGSTKb3hoL+V/cczjn///fd833nXviPIWED8/l81/LCwmFTRkALKpJDLblRpebMlc3ZNcxdSfWmiqVSafWBCOjv7091ufgphNeBVJiiis06k/PE3dlKpVLftYDB9OCoiZ5xSE8Y4u1KdEpxb03cnPhqp5BYO+dBDsZjGT4V4X1B9u2KHEBkvwjHupNe31y9VgRsW0g78iBdvSjiju6auD0uVfyJ48C9Vue2HVhfuTsRofAkpr9j0oMQ7xCX95JeX61eu9zqdK3GYHpwFOSV0NTK5wN+Jl0Jgmc1xhOo+p3CRXgtl80e3+RrPPT396fisdifURqua3Wl58bt2381F5DJnBbkw46aVafNyeO+79egZQe6XPxU1G5fTCQe3uLaam+Dc67PwTtNG9YvmY1zHgkxsy9yudwAILlM5pCpvRsmz+DNQqGQgI1XkMtmj5rxTVQBDajqinOuK0qOmRypBtXvHMD69bo7boCo5ACIjkCzB7QQkm7JsC8FO3x3aXF/xZ+Ii2kB0x8jC1AZbgpQkVyYHBP91sHXAFNTU3cBKwfBTzHVl9jYjbAwNAcbPZAdSK845xJRCnDPPVW5Vfm1YQ5msrMCj4ZNV9WViZvBHnf/0PYQZKnxnM/nuwS8iCUMGj0g1KJkqulM+Va53LCX/l56hh0G205w8O9F5MyVO4dvgbkxWieb6KFI+YA6N94UYM6uRcoWvt9UTIgsQLDrTQGYuxIh11zcFRvG0NBQr4Onowug2BSQ6k0VFZsNxQ5/VCqV6aa9uvo8Eb4tYX0gDfjZsaaAUqm06kzOh8o2gs229EUhB3DiPr7K1bWmAADi7qyqTu+Y1YCQbjWXde2iYe8ZdtqUn0PwTyb27vmoYTSPztzc3LKX7A5EONaZn17PS+5Let4P9Xp9bX5+fjHpeTOYPOfgyH2+igA7OV4u/9JSbzMOpLOfILwRYiULKAGOR4DHQsRj2Lmq77+9ZUHbEDuQyV4AXg5TNCzM9EI1CE6wZWa0u71srl675CW9PhGGHwg5dq4aBK9uJd9JAIDV6rXLqW7vhqq+ICIP7ZJ7Euxk1ffP0OafoJMAAOZqtd+S3d5nAssGT4b9SVHVaUE+SOzdM9racO0Q+gIpFAqJOzN3XkR0BJXhjXnuAeagps6NC3ZdoDjgZ8ca5/x/j38ACP1oGMmpYucAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-jobs { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAyVJREFUWIW9l0tIVVEUhvc9x5LoiZJUgwStRhI9kYpeWEjgoKJBD6dCBdG0QVA0ykH0GgQVQRBRBBENokGkSWFEUKRNmkRS3kwrLUur/f9/A4+x2e7jfVQuuINz7lrr/9Zae599TsbkYSSnG2PWGWOWSppvjJlqjBk2xmQzmUyHMaY1iqKefHIVZCRrAVwHMKxxDAAB3Ce5TVLmXwhXALg+nug4MO0ka/626u5ixB2IIZKNxYivBTAYSDgI4DLJPSSXSqoiWSNpK4BTAN4HYkhyfyHiCyX1e0kA4ATJshyxpSQPAvgagGjIKS4plvTUCx6QtCnvCpIiALzy8nwkWZErcG9ghqsLEXdyzQPQ5eW7mBogKQbwxg0geSDNl+R2AKcBnCG5Q1IcgFgDgA7AL408P4LE9R7tS0lRQHyWtfahv9iste2hNQLgilfU4SAAgLOe474Uv2u+uAN9IwC83PN5nAbwxAOYF+hShbUWaQDWWkqaE8j91gH4KanE94mMMdWOUE8URd0Bzqo4jseMZdTiOM5Iqg789eyPUBRNklQZApjhXPemaGTTxB0LgX/wrmeGAOBcj2mRMcZEUfQGQFuaMoBHURS9DsT5O0Sh4C5nTt9CO8AYYyRVWWu7AvN/S3JhCtgDb33NDTnd9ZxWpFVKskzSUWtti6RWAMdIlqf4TgHw3SmuL5hU0iFvu5xMA0gSV5Jck/zGLCrHb7eX92aa4wLPcdBvFclyAM0A3vkjSO4ddzshqQRAp9fZnalVAbjjJb2t5M2G5CIAWV84AJIdXQskjwQgJ4/X1mUAbGgUAC7kEndizpNsdM+BpPqmVHGnC82BhFcB9BUA8B0AvHttyuc9USNzu5evWAFQvSQX5wRIIKYBaPkPEH2SluQFQbIUwLm/FHwC4Id37xPJZXlBJCB1AJ4VKPyOZJOkDMkG/3sCwGeSK/OGcEAuuUerZ/0AbpHcJW+rkdwS+KjpJ1lbEISTcLZGXjQ2kFxNslI5VjjJegBDXicGSK4qCqIYI7nZPRcSiC8TDVEXgHg+YQAJxMbkyB8F6JhQgARiLYAXADpJrv8NegkwrC2fDmsAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-leisure-sport { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABHFJREFUWIXtVm2IVGUUfs6ZO83u2kh/tt0ta/0Y7vvuaLtbS/hTLFutzcDQPrQfJUoGYUE/gqBPCjEwkohIykqSSn9YEFhq2ECKm5jurrsz944Fi2sFaqk47q7de04/9k5cppFlXUMIn1/3PV/P85577uEC13ANVxlUxZaw1t4LoEtVZ6vqFCL6g4h6RORL3/d/+M8EuK57F4D3ANwM4DwzN5R9qnpcVacA8IjoSc/z+q6EAI6RPwVgJzNvF5GbiOhrEQkAQEQCItpTU1NzKxHtJqJ91tquKyEAAGCtXWKtvWCMWVhhbzLGrLTWNsXtLS0tC1zXPW2t7Zgst5PJZKYCeF9EfmHmZNxZKBR+A7C5MklV65n5LIAPAdwOQC9XADuOswpAPTPPBtBZ4adMJjOrioA7AcwA0Oa67sJK/0TgAFgSO7vlh7a2thtGR0c3AVhqjHkzkUi8NDAwcDES0Eg0Nr9EtBjANwBgjEkT0dtE9L2qPk1EL+Tz+b3W2rUAHojqnwewKwzD9cVi8QQDuK18MRHZDADZbLZ9eHj4CIBlYxz0fBiG3a7rzgAAZn4FwKlIQDZ2gU0AVorIIyLycxiGO7PZrFXVBaraA+A1Vd0iIosSicRhY8x0B8D1IpIjoh2+728DABGpZ+bmeKuIqF1VUwBQKBT8lpaW+0VkNYA5kejrROSkiPjMfB8RbVXVtUEQNPq+vxixOWltbd04MjJymJlfZgCniehjz/M2lgMaGhr2isjpuAAROer7fqF8zufz3QD2qepJADh37lxCRJ4goj0AvgWwQlU3ALiIiiHt7e0tEdHnIjKfVfUgEc2NB+RyuYCIdsRtzLwd/8ZCZj4IAENDQ8NE9AwRrVHVbVHX9jc1NR2okgciCgCkyBizXFXfIaLpIjK1WCyeiNo0JQiCdDmhVCqdGRwcHMlkMinHceYw81kR6QXQXigU/HKcMcYQkarqjMbGxu9yuVxQTYDruruY2SEACdd1jxDRIBF1ATipql95nre6Mslau1VElkX7okdEjvi+/3g8xhjzFjN35/P5L6oRA2NDLiI/AVjDAEKMva95kb+eiFa5rvtYReHlAJaXl5WI1NXW1j5bpf58EbnjUuTGmLSIbAHgB0HwCQOA7/u9ABYh+rQAgJkrF0z83JdMJu/u6ek5U0lARL8DmFdpB8ZWO4DdAKaHYfjwsWPHRqkyQETWAVjBzH8BOBqJmopoX6jqxlKptG5oaGj4Ejc8QERzVfVdx3HW9/f3/2qtnaWqDwF4johKYRg+WCwWfwSq/w9g5syZNzqO00lEswGkAZxS1cPpdHr3oUOHLlTLAYDm5uaaVCp1Kvp/uCXuE5ESM3+QTCZf7evr+/Ofjl2q2ETR0dGRLJVKbwB4FMAWAH2qGgBIM/Pxurq6/dXEXxEBxpilRPQpxmajM37D8cDjh4xPrqqfAUgB+Ggi5ACQmAy5tfYeVd3BzI6qvuh53oaJ1phUB0RkmJmDiPz1ydS6bEybNq32qhBfw/8GfwPxf+1SpB/79wAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-licences-permissions { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAopJREFUWIXFlk+ITmEYxc95GmVsiMVQRDFMoUapsZBSM/6UjZWFBQurYWPBwsJSkig2lopE2SGhbCliipEo+Vf+zSgaTdF7jsWM3Pnc+937zXcnZ/Xd+573Pb/ved573wv8b9nemFJ64RqVUvoiaVeVfKaUXkbEirr/mKSxiFhA8mdTANuuO/yPbC+MiE/NPB0NE/pJDreZ++HPD5IsM08BIDlK8mM76a0WNNoJq0MdeTcl7bF9HEBZCU3ycERcqBUAwDWSI1UAANyfbnghQER8BXCjnYWrKncPSNrX4ovn3HQBcitA8qLtB1Ueo0n/u1oBbHcB2GC7EgCAWQBG8wYkHSJ5h+RQZQAAvbb3RUQlANtzATwoGNtt+4ikTRHxJM+QVW+VwBKYrBamlIYm98kL27Mb/UXvgW229+Pfx9Akj0bE41bBIqLb9gEAJ0sBALwh+bBxE9o2ydxeV5HtwUaA2luQUvqW14KMerL+Ws4C25S0RlIXyR5Jz5p4V9cOIOk2ySe23wPYS3KrpLcF9nnZi6I90Er4UpL9ABARHQCO2f5OcguA8ZwpU/ZV2xUgOSrpR/ae7bMA1pP8Vja/DoAxkoNTFo2g7fOSdpbNb/wk22x7WasQtp9KOh0RBzMQHZKuIL8N+QAkT2WvJb0EMB/ACIDnmaFFAHoBDEfEOtvjJDdJWhMRAxmIWZg4J6oB5OgegFUAXkfE5QxYH4AlmPhmWBcRnZKukhyQdDMilpes+1cppcetnP3NlFK6K6mvxHMpm09J3bZPAFhc9fRrJtvbSX4u8WyLiFvtZhUqpfSopAqvJHXOGICkHRU6dnzGAAAgpXSppAq/JK1tu+dFsj1H0nUAK4s8JM/8BndOtHSvCiIKAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-licensing-and-permissions { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABRRJREFUaIHt2mmoVVUUB/Cf2rOC0tLGZxKRZFA0UNHwoaJBKhukkSYaKIIGohkabSAq3ociCoSg4YNZUmFpNEAUUTQZKZXagFhqZQNF2VN7vduHtV/3+Lzvvnvv2+ca+f5wOPfus/fa63/22WuvvdZmGMOAHfAS1qHyH7zWJf12GIzIiAYJz8VULMZvDbZpJ7bBZLyIU3IIXIdFOQSVhBH4En8OVnGzBgV2GHhkD0lXu/AOPuxXVhH67ZarkwreG+DZYu2drwsG0OMj9AxGpNERHggTMAlLMH2IshrBPdhTGKdVZXZUa4R3xbvp2RVldl7Atam/N8XLLqKhEW4URcKHYil6U/kLGJmro0EwSiw/FfyNr3FQelYa4SvT/09xqfaR7cNIXJb6r6TftGEOd+GJIbRvFb2YgbV4XOO+BNo/OhsdQ7XS9dCJ07X2UnvxLL7PqpFyCV+OW4bQfizuzqTLvyiTcJdwEka10LYXr+ZVJ1Am4V8xu0T5LWHYaLWIUfgcu2eSVwuLsI9Ye1tGLsK9+AS/Z5JXC0sMkSz5CFdwViZZpWKTm8PDhP/v2OQIl+F47IVnhOU+FV/hUUxpQVa38MeX5FKuDMKbYzuxQR+dyrbBeE1u5UQUcvSgtZpAGYQ/xk79ys4poZ+WMDyHM2C0cEJ6xVzuwQHYvwVZa5KMv3IpVwbhE/BU+r0Kr+NJYcxawS94OYNeKIfwPJwtjNYbqexc7Kc1o/VaPtXKIfwXZvUrW2DgjEFbsckZrTIIH4ifxPzdO5U9IyIgzV7fY9+cypXxSa/GcjGH+9KXK/Ct1ubw6nyqlUN4kTBQRVxbQj8tocwgXg5MFtNiS6zE+6oj/ne6Z8snFVErt3RhGR0lTMNCG+aGV+MR4ZePxY3YNrVpS344N0bgIVwlRnAO3sYfIg99hgjwn4zj8EBZirRrhG9Pshep7Zl14K5UZ7nYlfWh9HTphbmEJ0wSTssK7FgovwDzxZ66M5XdmXSYUajXdsIjscUgVz10DSD3erGJqIiX0Smm4tJUPibVa4hwLsdjM3wjIhT1rpl1ZBwlFO6fnunCVrhPkL051XtWBBsOa1bRHOjBK+KzHAgVceRoIHQKz6qWo9GDO8Ro9x2R+ird+5/1qIucVvqSIbZfq/p51sI63KCaM9463bub6WQon/T+6ivYLBaK2Nc+deo8qLoTO6LQLjuKRutiVUfgZ5yUqY/zksynG6i7r/jMPyuUlWalO3Ai7hdWcq3Wwjf90Xe8sYLr6tTbBV+ketcUyksjXMRp6dlzGfo43/pu5PM4WHXajRdL4o+FOgtVTxi0hTBhRHrSvZlrmdg7E8vOSmGYporDo32kusXUKf6/Xuyxi6cA27YOzxJ73TVNXt0FBW/FzsKPnidGdpqIZ22BcYL0bSLp3iUsdrdwNcdl4LEe6o3wUDFJ2IHvVJeaPsxOfa8Ro79Hv+fT0/OHxQgPGs5tNAKxDNuL7divDbZpFBcJL+si65/sOxxvCUP2ioh1z7X+qrClyDt1iq/lGxu+lJZwhnh7ZZ2BXiXmc0fqb6RI2dSqe2xBrwlif1wRgf9Bj/83E2OajKPlTW5NwfGF//NxjLD+j4ljwnPSszHiE/5MhJAuF3O+j8NqEQzIlqUoA6NxJK4WBqqCD4QVX2PDI/0zU5256f6TODR+Jia2ReOMGKVqpCq4t0adiSKSWREpmBwOz0ZFhyC9WKzNtXATflA9GD6MevgHddnJiG0CHH8AAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-link { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAPxJREFUOI2V018rREEYx/HPrlKspVx4Jcr7kbZsXFBahaR4E+69jyVuFBvegS3rxo07yp+LeY6zHaY9npo6zTPfXzPfmUO9mscxrmMcYa4mawkP+MIjhvE9QKsu/Il1NGL0ImSvLrxa6TUxwkUObuMuAxcBz+jnAg5ji91Mfyf6u7mAS0lYAye4UgrbDPgGs+PQIlbGAoYR0FEKm8EHbmP9TxXC3jGN/YDWIuRJKWwZC+NwG/cBdGKuhfMIKoz3c+cthG1k+lv+IaxaXRlh1YBC2F/wL2HVOoiFPem8TWzXhUl/1SCAkfTCim1PhKekqzvDWwAvOJVu5HVSwDfQY0kR6i27ZAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-magnifying-glass-white { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAeCAYAAADQBxWhAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAoJJREFUSIm1lj1oVFEQhc9ctVASfxL8RZCkk1SCjeBvihDQVFEQLKxECwstrDQgKQRJEVG7EMHCQi1sbFJZmIAgCCYWNkEwqBg0xpgQUc8Zi+zq9fr27dvdZKq9s3Pmm3m8mfsMVUxSs5l1S9oHoA3AOgALACZDCGPuPhJCWKyWp5BJ2kLyFskFzzGSX0kOuPumRoG9JL/kwTLgHyV1F8lvGcALZjaY+BzASwDjAOYAbASwJ4TQkcTJzM6EEO7U0uGppHqRHHL39grxu0neSzSU1FMU2EZyPhLPSeoqqD1OcjHSzkjaWlVI8mEk+iHpQKFq/4KPkVSUYyhX4O7tJFkWSOqrBRgVfiMpvHK3ki5HwZ8kra0HKqklHjFJ57PiAgC4+5HI96DeYQ8hzAB4XD4nef+FAvjz6pvZaD3ASP80OnZkxZShrZFvqhEogLfR78150Nj+Wxi1mJnFOTNzlQOmI9+uRqDuHuuns2LK0FeR6FCD0MPRcaJioKRL0SablbS+TuA2kt+jkTmXB91J8mc0q9frgZIcjnIsSmqtJribLO2jtQAzLoubRUQ7SM4klZ4sCDybPKkPklqKVtsT7+BSgkeS9mbFu/t+kiOeGMnXkjJnFMi+xE+7+3AIYVXin8LSRT4LoAVLl/j2nAbGzawzhPC5aMedJN+lHdRqJF94Ld9Okprd/SrJ6SqJ35O8n/P/c3ffEOeuuvLcfY27HwSwz93bADQBmDezSQBjZjZqZpTUZ2b9FRp4ZmZdIYRvhbsuaiT7czoedfemZYeWwNdywE/cffVKgQdyXoMTKwItgQeziJIurhi0BL6dPN5fkjK/JpbN3N0kXSH5huSEpF4A+A05hK/w2S4AqAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-magnifying-glass { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAeCAYAAADQBxWhAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA1pJREFUSIm1lktsVFUYx3/fuR0giMVHfMbEwErCwrDTxBcYSaUdSrDUB4smJOrCV2daYog20SpoQJgJPhYqxgSDCWDSzp34wGg00oQFiQHcsMCFND5qsAaQNrT3+1zMcO9te68z09b/as7/e/zOOffcM1eopa0DVxM0tWB2N7AMYTHoP5g7g9gQNvYVhUfHavaJSVIjPZ/diGX6QLYAi9Nb6HnMvc9C2cGbbaOzh+ZKjyDyIXBNPU0qbEYQ6aLQ9mXj0JzfjVCY1tGAE8BJkPOVycgqYOU0sOJ4kj3Zj+qH5v3NwCdTYOb2YfIGxbafZ1S/UF6BZy8DT0wBYxsorvdrQ3sGlxFwCueuqhZfAOuguP7If826Uut3EOh+nFtUqdVRlBXsbf8jKd3FZrgzBGITQGtdQIDd2cM4NlUfAzh3LZ57PS29Au0uL8fcxsiW1yhmf6gLeEV72suY7I1aWBfPD96UDnX6OC5c9Tns0lsNAUMt6AcuVakZPLcpHaqyOnTUDjb6socqtPwFlCPDVielVVen0dEXjs4KGHKIHovIyqSU6vbK9VGRnJ0TVPglGugN6dC4PEm/GuuSxd+IxF7VBBuJLL19blCJ6p0bScqoQI2fQsfk/jkxjQei33oqHYp8EzpqHTz3efOsgL3lmxF9OILG+s6AZpo+RXWy4shSmiZfmhU00O3gFgKgOs7E5KF06M51wzgOxGbYS0+5tSFg3t+MyJZwLPIB7248lw4F8GwbqqNV1xEEh8n5j9UFzJWeRvXjcKz6Oyx4JS196pHuLmVBBmJXIhgDmNtOsfX4jOp86R6QPmDttMhpJrx7eXvdn7WhAN1+F459gDfFV84CJ3D2N9h1lT9xuSVtNRgnuTyxJmmLky+CnsE1BG4/jltTm9Yj5UcWyYPTv51m3kgAu9u/JRPcgfEqaOIWRbLfgIOJIccqLusRXvx6adyufeU9dTzDkl/vw6h+gsoSzC4icgazIYbHj3KoMyDv9wH9KV2O4QVr2bXhQn3QRpQr9SPSlxIdYnyshfc6L84vFCBf2gGyLTFm+h3NzQ/NPxQg5+9C6E0OSmfyQZqrCtmtYMVkpt72/6z0inL+OwjPxJwA1Tu91IL50LEDX3DX6UlElmM6DDxLsf37fwEvRBqGqCm4gQAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.site-content address:before,
-.icon-map-pointer { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAa9JREFUWIXF181qFEEUhuEnIYrbIEFcShAkioKiO/EPyW0oZCEIBtRcg4t4ByIKceMd6EIRFwFBEYwQBLf+oMYYV6IkcdHdEEOfYqaqOx44MNN1vvN+3TVV1TMiL6ZwAvvr75/wEsuZ/QaKXbiKd9gMchlXMNY1/BDeJMDb8zUOdgU/ju9DwJv8hmOl8H2q+R0W3uQHTJQYeFgAb/JBCjCSGDuimveo5hWeYAMXcDKo28RhGStkXvsdrWOmpX6mHmvT3BoWTrWu25rNJzS3A82LHAM/g2aTCc1koFnNMfAnaLY7oRkLNL8jwWii2efg+oGEJno6Ua+kgWjeriU00VjWb+CyeG3f9K/5Ucwl6i9FkNQ+MI6P2BOMv8fTGnBevPf/Up2aPxKsMBaU74QLOeAmTnVgINohB47nBfBnpXCYLjBwsQsDsJgBX+wKDucyDJzt0gA8HgL+qGs41etVdNxuzXUc7cMA3B3AwJ2+4FTviGsJ+Fpd02vcSBi43jec6sx/2wJf0sMfkijObINv4PROwZu4v8XAvZ2Gw158xZf6c1aUzNkKZlVPYKWgz/+Nv8q0MWZzOVSyAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-map { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGcAAABPCAYAAAD2vtuiAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAGJtJREFUeJzdnXt8nGWV+L/nzExbWgr0kklpSyaTliJ1RbQuqKClv0W84+pCUSD3LEVF2AVFuWjtiiLgZasgG+ikyYQiVEVFFFCUS6uigC6CIKXNJKGlmSSUgrTNZeac3x8zU9Jk0qbJpK37/XzyybzvczvvnHne93nOc57zwj8Am5tmzzjYMhwM5GALMJiu24+ZTSq4yJxFiC1y00WCzdDUpJlFdc/9/WDLdyAJHmwBALpWR97gAf26GSd5iqMBRAAU0cx/n9j7fmDtQRTzgDOuPScZL/28wwJxecLV/tQ3If1kyTmbdw3M0xWPnudGPcoUAIPt6v4ELk8Q8CcwTkPkkwDm/nMV2Yn70+HK1v8aT9kPBcZNOe5IV3Pp8yDzcufMSCv2LKpPOP4MLu8X4TQAx+5x1SuLz0s8LYLnyiQb588TTW/MI/iZRRWJn42X/IcC46acZGPpGaJyf/awGbcTzXWhKoFBWXtwv7ioonXVQKUMpLsxepJhMxD5cK4XAR0qgeNmlm98dbyu4WCj41Fpd3PJQkcaAXDi4YpERbiy7YR0b88RJvYOh4twX+3woBknhytbbx1OMQAzqxJ/3P5K6Dcgb8mdM7fD0un0GeMh/6FCQXtOZ1N0gYsvE+RSAHce0v4JZxZqlNV1+zGzPRXckjt255YJZp+fVt22vRD1H2qMWTlevyjUOXHbR0T8QkT+Zfd55+7eSf0fHzwAGCsdTZF3ILpes73ejPJZVYnbCtnGocKYhtLJ1ZETOwPdPxW0BASMXYjfISo3F5UnHt/brWq0zKps+31nU+m5uMRQpojaqK7Bl6PdpZEF6WBgTqhfNsyo2fRCoWUdK6N+5nTEo+/xAI9kFAPgl0wIpeeEK1trisoTj42HYnKEK1vvRKwFQCTQO5o6uudFP+gBfVbdH0gHUw3uiDvS2Vzy1mR83vzCSjw6RvWrSzaVlrtZg6oGHe585eVA5YJLNo7qSxoNG1bOn4inyxDQdN8jo6nDnU+9flPX07uaIhsQVYQy3O4GPlIwgUfJfvUcdyTZVPYFEYmrahDnG+FNiXMPpGIAjjgq/S6UKRhPzqzavHuAsDVePGVrvOyfuppLj9tb+c41ZccivA/oQbgKANX5CGUAIpy5NV72T+N5DSNhrz3HHemORz9hsAAg2cTFqj7NDFf1/whXtn7nwIi5J4J/AATU7wXwBxcHu9rbY2aUq7q4C51NpdcWlUS+JEseTg0suzVeFrZ+/4MqYNxRNDlxXVdPdDHQImJ3muvHBZYFSH8eKD8Il7ebYUdrybULD2fXzv8RkfMGJfW4y3nFlS13jbNsw9IRjz6r8AaEd4fLE+uS8dI3C/K/g/M5PEjazhXVIxDehXEqSlUmzdoh+C/FFZv2sD50N0ZPMuUPBltmVSTmHqBLykventPdFDk+3bPrRyJyvJv1Ifo74GEAV7tvVkXbowdUygFsjRdPEbMyVHGTomTj/Hl4+qO5n5kZfyIgl6unvy/oEgK6dXfh7E3csMdV/Mxw+aatQxoIBF7E0yjMcUfGc2CzL4b0nK6m6Lnu3JK5p9vTEpCzispbnzsYwg1HZ1P0UoRvDklwe8oCet6s8xNPdTfOnWMavBPkFKADWAe+Hvd1RSWlTw2+3eV4eXXkqP6AbgEmA/+jEvj8wTIR7VbOhpXzJx51VOrbA2xXTf27ej41Z9nWnQdDsL3hy9GueZH7QU8HdoLd5SbN4UTrA7IC252vflGoc+IrJeHKjS370wM6m0rPQeQOADMc5TmFx9z9Mcx/UFzd1jEOlzUEAdi6OlIqAX6g6NvAekE/XVSeaDiYXXpfdDfOnZMitEQmH/aT4qXPvDaSMvX19ZODweA7gSIRSU6ZMuX355xzTl4LRrKp9HMunAN+gqKh3Hk3nkmFQovnnLehu0CXMiyyNV48RZi8WeEojIS7fay4um3Iw/UfmbVr1wZee+21K4DLgakDkl4Brm1ra7thxYoVlq9sYnVk0uFBfZMZ/yzCTZmz9peUypmzz29tG0+5BSAZj7QJWoL54nBV66gmdYcysVjs+yLy8eHS3b25tra2Yl/1JFdHZomwDtX5kBkNinMPcE+4MrGhgCID2fGLwCMArnJCoRs42DQ0NFQOVIyZuZm9NDCPiJTHYrFP7Kuu4uq2jlRQTnfnITPSAksQvon4L8ZD9szg0uURAIHvdsSjD3XEow91NpWeMx4NHmjc/TMDDhOBQGBhXV3dTDN7E7A5lyAinxlaeiizz29tK65MLJkUShfhXJ0tPc8fXFxwf4xMzzFfN+DEYoXFuFzr9YtCwxc99Fm+fHlQ5PUFOnf/cnV19d8A6urqngauGZD9be4+4iWUo85rfzlkdhNYF0BXW/tXCyV3DgWYWdX2nIgtEbElJnJ6NiXaNXlbZaEbPNCY2e4Rp7vvGJg28HhgvpEyrbptOy5nm5FGubwzHj17bNLuSabnCF5U3vZQUXnbQ7PKW34tTsZkk+ZqX7twwlgacHdZtWrV7Hg8PqUA8u4XK1asSKnq47ljVb28ubn5CIA1a9ZMc/fLBmT/g4jst4LCla0Pi9hqANyXjVXmgeS1Ss88LHFnNjXS0dOzYLSVNzQ0nBOLxV5Q1S19fX2vxGKxNfX19UeOtr5R8v0Bn0/q6+trbWhoeLi3tzehqicOSLt9tA04eufoxRuevMqRpaTB/woQcBuVK+yqVavOMLPvq+ocAFUNiMi5oVDogDoGikgT8NqA42nAu4HdPxIz297T03PILXXvZT3H/5z9f9aQlBEMFFT1MlUV4Ec7d+6cCpxhZmngjFgs9uZRyrvfVFdXbwe+t7c8qvqdiy66aERWhgPJsMpx9CcAiF6UbIzcnWwqO9Ud6Wwq+0DXxO5nuptLFu6j7mMA3P2Oiy666LWamppfqWobgIiUFOoCRkJ/f/8NZjac8XJbf3//tw6kPCNlWOUYO+9zuBWsV1Q/LOLrupqjhvjPUZ2fssC+Hn6PZf9ftmrVqnfEYrH/BMoAM7MnCnUBI2HZsmXdqnpdvjR3/9qyZcte2Vcd7i433njj4YWXbniGVc7RFckdxRWJCyyoEYevOGzbI4Nb1dZ48bAjMDOLAYjI21X1dyLyrez5++rq6l4skPwjJtv+HrYwM3t+6tSp391bueXLlwdjsdjXVq9e/fLkyZP/3tDQ0NLQ0HDuuAqbZZ8+BLPOTSSLKxJfMnaWOFat1j8XbL2qHhHww4YVsq6u7hF3/+2QBlULPlkbCdXV1T3ApQPPBQKBi5cuXdq3t3KRSOQ7InIFrw8gosCaVatW/dv4SPo6I3bwyPSktsaZVZu3IIHMA1bklq7GyJK9mC6+MPDA3X9WU1Pzu9GLOzZqamruMrOcHeyH1dXV9+0tf319/UwzuyB7+GkROdrdmwFU9arXc/q4zOFG5be2fZvelTNbuOpvul5o7+iMl940OF9tbe16sntqzKwvGAx+dkzSFoZPmdmWvr6+i/eVMRQKlahqwMx21dTUfK+6urrD3W8GMLN5AB2N0RPU5ft7r2l0jEo5Cy7Z2OvIe3CuM2wDMAPkU93N84c4RKjqpcDfReT6ysrKgpvV95e6uro2EXnLhRdeONR/YBDBYPA5M+tR1cMaGho+G4vFylT1PwBU9X8BVPxClMMALCD/WUhZR+3xWVzR+mS4MvGF4vK2N5jxJ4C0pZYMzldVVbVFRCoO1rMmH7W1tV0jyVdRUbFDVXOT5htEZBOwNHvcACBoA4CZvVq8Y/rfCinnmLeAiOAqrMl8ft2RfSDV1dU/yT6Q/+FQ1euBwaukbf39/bcDzKxoeQKzp1X1iO5J2y5+qWHeMVvWLJhZCIt+QfbnuPivsx8rO26PFheizkOFqqqqvwKDTTvLly1b1g+ZHyeiqwFc+EY6aO2hdH9XctJLPx5r2wVRTnhT61MYTwJov/3qIG5NXwB8jIyn5geAWYWoVFWvJGufM7PHqqur4wPT0yK3gf0Fs43mvAigIh/sikc/PJZ2C7Z5amu8LCyeXq+ixxr+xKsvB085QD7UCtQAnwUG+0g7mSX4/wJ+M5ZGYrHYZSJyvZmdXFdX9/je8iabSj8jIt8BWnsm9i8c7R6lgm07PLqipVPRrwPgfsSxF2/c6+SuQEwDHgBuZahiIPPjWwz8GljJGK63vb19pYhcuC/FAIRLIjeD/QUondgb+sK+8h8QkvHoHZ3xqHc2Ra/ad+4xMxl4nEzvGOnfLQdALgCSTWWndsaj3hmP9CQb58/bd4mhFKznbL917nTB/tUMDyLNhap3L9wALNrPMv8ODOu4snbt2sDy5csL8p0UV7asB5pBJ7qkVo6mjoI8c3wtga6e0odBTsG5L1yZeH8h6t0LUeB5GLJtPgXcD7wAvBU4KU/ZFuBYssPjlStXTpw6depn3L1KRI7P+hI8paq3Hn744fVLly5Nj1bIjL92aLMZ6VlVif32zinIr6Srp/QakFMwdhh2ICJrnM9QxWwD3g58CPgkcDKZgcJgv4Ay4F2Q8SOYMmXKOjITzDcCqqqB7PL1Ta+++uov6+vrJ49WyBmRecnRloUCKCe5duHhhlxuRhr8A7Mq234/1jpHwCl5zl0BDF4nWs2ePgR7lO/t7Y2r6j8P14iq/r9QKHTjqKUcI2N2hAv/9ZmdybLI31X1SBUbd+fuLHPynPvlMHnvAwYvbcy99dZbTyLTywBw90ezC3IhM7taJOP9amZVsVjsmtra2pbRCqtKINlYugpAVLaJ+HozekVkuQXS5886rz1v3WM336zAxOUJgFQ6sD7ZVHbqWOscATvynBvu9pPPnL9DVd874Hibu5+RNTP9IBQKvcfMdgGoqojIe8YqsKjUikot8Dl3+amI3Ae8Q9OB77nnf/YXaLQWvMCxP6oyTcTXdcSjY76YffDnPOeq85xTIJ9j5J9EZHruwN2fraur2x1lpKKiolNVWwfkn85oeOhhQ/j33X/OZcANYOsH5Hpvd3M076JlQfx7i6s2bvL6Rad2HbatD0CwOV6/KNRx2MvTjq5o6SxEG4P4BXDhoHOXAp1kJpt9ZL7Q/yYzSBhIbkR3RO6EiLylsbFxTlVV1RaA1atXvyGdTi9QzbqSu4/K2pzZyJVYlS/Nl6OdZdELRbjJzb4MGePxQAo2z5FlT/QDTQCC/mtyUvdfxdL5HtyF4H5gsNlfgevJjNo2AFvJvxv6XmCbmf0s66oFMNnMfhuLxS6PxWJXuftDqhoAMLMdoVBouOfZqJEVWDCtPwNw1bw9s6BRo9w91xM/oqLHIjpeYR/7yK6n5GEKmXnMcG7E9QB1dXUvisjAeG0REblORK4BdlvWReT2ioqKfM+4MeOhjPuvwPSOpsiGznj0+g0r50/MpRdUOSKyxybYoDOeG11vBPr3s8zfyNwSAXD36/eR34LB4Df2V7CR0tdHL2ZPG9avoscCnzvqyPQfupsix0OBQ3olm6L1iL8myLnALMTPCZe35nW/jcfj4VQqtQI4Hehz95+kUqmvLlu2bH82CMfITDRHSiWwh7m/oaHhfmC4uG231dTUjHugCF+7cEJy544PqsoNIPMwdqF8pqA955XtgYuLK1ovc/fMxM/5Wteq46YOzldfX39kKpX6LZmH+nxgoYhcGQqF7t1P29ZXGXnv2UgeZ3Uz+0K+7R9m1pdKpb60H7KMGln6TN+sqrYfu2tm8KAcBn5FQZWTW795ZXvwCjOeA5nnE/qG+A4Eg8FPklFK0szOcvc6M+sB3l1SUrI/AYFayPSekbCczEhtD+rq6v6sqk2Dz6vqdy+44ILEfsgyJvzBxUEhvXsp3/HQuISRXHDJxl5Rzw0h8/lFvxnA3WN1dXU/qq2tjanqPQAicmKe/HtjBfknpQP5M/nNOGTbvGKgL7WZdYRCoQMWfberMbIk+UJ7q4vsNiUJ0j8uygFwfEhE2wFsBBCR05ubm4+45ZZb5pKdj7j78/vZVAeZIfTe+BxDDaC7qa6u7hCRL+aOVfWy8vLyAxK1I9kYPSut3K8wJ/uszkQRNjl33JQjJh8aLk1VcxOuk/r7+7uDwWAbMBd4zd1/OormvkFmmSAfPyWzErpX2tvbbzSzx4AHampqRr2Ran/oaIpc6LA2F4TCnBcN/4XgH5hZlfhjwUMXe/2iUNekbV9DyHh3ut0YrmwbslM5FovdLSKDHSBuqKmpuXyUTS8FBu8w6wHeSObZtE8aGhrelEqlXjsQz5rk6sgsyQVNcr+2qKL1qsERUwrac168rTTSNWnbIwifNTCHK4ta2i4ZJvsXGeAPZmavBgKBvNs0RshahjpxXMcIFQNQU1Pz1IEaBBRXt3Vg/AEA1afyhbIpmHK6mkvP1JT8GeHtBltUOK24InHtwEBBA6mtrX2SzHpLVj79SmVl5Uv58u4HnyJjPQDYBHx9jPWNKy7ZOZd53ughY1bO5qbZM7qaI6e5y09VmWZwbzoQOjFcnli3r7LufgUZc/1f+/v7R7XOPojngGuznz9J5rZ2yNJP752G9ZtwRmdzydGD08esnAky8Tl3fTB3XLwp8aGRRlSqra3tMrPLROSCnAdlAfgacDXwqwLVN27MrXzxJUXvUVAsMCS8y5gHBJ3xaDcwA8DNf1Nc1ZrXX/r/Gr524YSXevvCqXR6eiBg00kjRVVtD+675J50NEY+qqp3YTwZrkrsMccrmHIcvhIuTyw/lGO0jYXu5vlz3dOL085J6pzs2FtEdQ/LtzvXhCsSX9qf72DDyvkTj5yWflFguuMnFle0PplLG/NtzZ0bAQS+2NkcrR9rfYciXauOm5ry9KMOt6lwMcrJojoBs9fA/pLbLyvC1Z3x0m8Ot+zcteq4qZ3NZZ/ojEfv6oxH10LWmoLfkc2yh5G1IPOcZLz0ckGuA9+EUePqZYJEzGV6QHjg5ZcDvzzQsacLSbKp9FsimY1RDle6yB8nTOTx6Utbdu/C7miMfFTgjmxvuiFckdg9X+tuihxvol8F3g9Myp3P9ZSt8dKTA8ijQEfRMSXH5OKPFkQ52dd6PTtcupv1ieq95nZfQOXBmRtbnx9uiH2okAnEyvvM9aM4Z6OWwvRts6oSfxmuTFc8+mGHuwHM7GOzqtp+DJCMz3unYL/Nnl+H6ikK6sYdxVWJT7gjyXh0swqzHXt/cUXbfVConrN24eG+c8ezqjoXwPHbBdodiYrxBpQ9I3YYu1BvAXncnT+apO89uqL9gFmA90bHmpIy0oEGjFNzL2IyMIGLiisSN++rfC5yr5m9KoTeWly1cdO2tWVHpnp8O0DRMSWhlzZvmZXy/hZFQ5h1mtKeia8K4JeEKzLB1AtmvsmYbV5aCbIxXJnYIyLGSw3zjkmH7L2Yv89c3qnKnmN6Jx6uTFRCxrW3o6d40qzy5M6DMbjIhi5+OSvYb4G1Ekz/sOjcF0YUOyHzSoFIu6rOxf3acGXrlQCd8agDqNvCmZVtzybj0Vsk47u9G8P6gxKamQuVXHDb2surI0ft62VDybULD9feXce78zngbJxHzblJsZtRPTwr6AaBa8Ob2uIjvQV2rik7VlPp4MzKtuFvsY50xqPfRjgBuCvdH7hzdu3GPZxFOhqjf1PlODF9W1HVpv2ONtIZj9YCq3I/uq5Vx031CX2vAgRdItMrW9q3rS07sreHYzSdDqL6b+JchvrKcEXrFbl6Dup7QjubS47GA3l+kdYLOnHA8QO4vOCi64IpeSDfu25yG5bMeTGogZNnlm/cvLlp9oygh96tIm9yWCDiETNKc7dfyJrnlV87vmZib+oeO3JCOncLcufTxZWJvQY1ykcyHnmfoPfi/utwZevpXfHoeQ63ga0PV7S9K2+ZxvnzTO3vA13JDup7QovOb+9IxiPPZ50bMLOUTJ4yLXz2Mzu6mqNnGXxbYQ7o6QgIXp0OOp1N0RaHp128W11a3HnOhf8WQIXZ5v0/TzbO/5hIqgmRUyD3KxQ0N3kwnjTxzSDvA84Q5IyeUMi1JxtK0tjlaqMKA+OqW8TAXOZmqmJBplLdNFyZ4qqNQ9IOqnJEcH+wdGHXC61ngX5eVdeFdwfwTvxgS/3RP2fKpHmS9tmisgjnJIPFKpQJlElGY0jmHw71ji1R9ITM6yt3v+AgiepVYtZCQF60iZO35AKFb42XhR0/W9w/CnIaEHC3xzQg5bPK20b1moBJu/q39E0MocpxXc2R09yYiIBnbH8j/35G0/h44I50NBdPProiudclZ1+OJo+NvpGUzQ+oFJnLQhGbYS4/LK5ovTt5e0lU0/KoGRNReV5MnteAf3kk72PY3DR7RpAJpxb3zPhF1kly1NfS1VS6HpV3Zl5ns/t7vjRckfj2SOs5ZJRTSNrvnHvYMUs39xxMU5I/uDjY+UL7Fx2uzr38b3+fYf8nlXMokWwqO1UkfQkuYqo3zypv2eeSeY7/D3i0Q9q3woVVAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-menu-up { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAAcCAYAAAA0u3w+AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAANdJREFUWIXlz9kNwkAMRdFbBvsOSv8N0Ab7jigDPpAlS0AUwsSTMU+63/YBu2XAHGgY3jRbBtyAO7AAmnHfCTuNk9wg3+GkJdCK99rvy8MljyyCk1ZAO86b5fYNTlqTCLIMTiM79i8X3y84aUNNkSFwGtm1fT9/IXHSlpogq8BpZM+O8roqcdKOSEgLnEb2bVjPWeKkPUbIGDiNHHjFSYeqkHXAaeTQK046hkLWEaeRI6846VQWmQJOI8decdK5KDJFnEZOvOKkyyekB5xGTr3ipCsw4x/2AFtH1745yzuMAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-minus-btn { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAFJJREFUWIXt1DEVgDAQBNFJyHtIQBMiUIEgPOAJD2nI0cbBFcw3sFMtSJL+rnDeO8Gash61N6JcwJYSUN6npgxPDDAgPaDBOCDpB8bSU3YlSbMPGQ0Ld0jFOAcAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-missed-bin-collection { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAiBJREFUWIXt1z1oVEEQB/BfDiXiB4KKH4WdiCJEY0BioYVNMIWNiFeIgqTTToMoloKxSiGICmIlFoKlX0UEUSQpJChoENGIHkgUEkWMEkksdo97PO4ul3dnAiF/WJjd2dn9787szHssYB6jHddwD5/wDs+Rx9LZIPAYU+jGZJSn8BtPi5OaqixwBivKjE/iIsar2O5Cf5SH0YfjCf1+PIBFcaAnIRdxEs0VNliDX1EuoDel3yOctgljeIi2qHuDZ8jFw6B0PVnaUGLj1dgU217cxqEUuX1CTJym5IILZW6gVhRwOcoduB/X/YZtGEnMPYabUf8HO4sEduNERgJHEnKH6NuIuziY6K/DS6yN/b6iIi+7C5JoS4yP4wbWJ/SHcRSfY7tVvIG84K8sSL+kF2jFOSEm4InwKl5jED+EAOzK6vc0geRN9AjPLI+WOLZECMZVQhDCVYzmYucRRhtABu4IJ2xJjb9KyAWcTRuely0GyiWzViHtDsbWLeSUYSEu0uTAhgYSqIROLKs2oZCBQK7sSjUibTxRz2KNIDDrmBcEZhKE/4VAXZhzAvWk4gF8mQsCX3EAi7FdqIAD9RIpYsj0iadT+IAZEz4+fuJUowhcmmbzEaG+T2BLtGkXan/VFFsrVuJ9FQJvhULyXSmAm4XavrERBGAzPlQg8Ddu9FGo+1txRSi1mfJBJaPlgq/L/cH0C8F7HTtiv0v481nAjPEPFhLDRhIpeA8AAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-museums-galleries { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAfJJREFUWIXtVz1rFFEUPeftrrBFiKCFRgSb1Fr4B2zU1tY2lYVgJ1iIjYVYWFjYC4JgI+m0sbHQBImNggSikCWgBPwgixA851q4s76ssxsz2cw2e6rLvXPeOfPm3scboAIi4qjtq5KWJL2yfSUiDldZay+iLduXJD2VtB0DkPRT0mPbFyIijU3Y9llJ9yVtDooOg6R1Sbdtz1cVPWH7uqR3/ys6wsxL2wu2Z3YTbdu+LOmZJO1XuMRIV9JD2+cigjvEJd2R9H3coiPMfLR9DQCaAEDyPcl7lb5XBaSUEBFbfQMAPkdEuy4DAEByEwAIAJJWUkpn6jRgu9NoNE4W88qRTx8MCADjOzAqouiB1wB+1ay9CpRsve02gCMAQPILye2sNgcgkeyS/JrzImI2ImYABMkNktHLNyPiWG+9byS3RtqS9KCYV9s3MvHT2RyvlfCWM975jLeQ8Z4M8sp6oFUEJA+V5QHk+d3qrSHxUAO1YmpgamBqYOIGmoMJko8AdAAgIhaz/GpE3CTZINkp4d0FMB8RAeBNVnoREbf4B0v/8IrA9kUAp/bzNnvAWkrp+Y6MpLcHexP8C0nLhe5EeiCl1N/5vAcWbX+qwwDJlX7c+3uZrUO4BF1K2kgpHZ+Eum0nTPAsSCmlJoAPtuu+Dxb48RtQcb+FZWyQFwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-parking-travel { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA11JREFUWIXlV12IVWUUXWufGzbpSFYUGjWJGghmGGVDYRMD4UtERVQISRLE9NBDiEUkFb40xEDUQ1AgzmMRTkVpP2APhRViRBmSjmCFUZjUDGSWsNfq4Z4b1+OduXfszry4n873nbX3Wt/e+3zfd4Dz3Shpse1tABa3wU6QHI6I77oqIDPHAKwDsLcN9kYAfxdFsbybAmoAlgLYWRTFkKS1AAYAXARgEsAHEXEIAGw/D+C5bpIDQABgY2D7LpIv2h6wPWT7gKQ7u01aFXD2ZMSGiFgN4B/bW2ZTQK3VpO0lAAYBzAfww5wLIPmVJAH4hOTTcy7A9mqSRyLi1GySTymA5G8kZ50cqDQhyX2SXrP911yQA/WNaBeA6wF82AY7AGBhURRXdFWApBW2Xwewog32BMknI+Ljrgo4FydJPQBuAHAZyZYxbBvAeEQc/B/6ziK+KjO3Z+ZJd2CZKUmbp4vZ8iuYgvw+29sjYqGk7yW9ExFHbasZZ3trRPTZfhTARpIjmXllRGwm6Rmv2naRmSPloiYkbbA9Zeky87My/bB9QWbuKLPxhqR5Vfy0GZB0uaQ3I+J2SQdI3hsRR8rgFwJYYLsXwAIAveV4fun7uO0eAD9LOhERD0halpk/Avg1IraSnGi1YkpaJemxzDzWVM+jmflTZv6emac76YE2/fHCfxmQ1A9gwPY6SbdExCIAaG7wiLhmumydg60EgJrtYQBPVQnnwK4GgJqk9RFnXgsk7Sc5CuAYgKW2H4mIVTOJLul9kmMk/7B9ne2hiFjSBOkD6mdBT8XxZZKDJHttP2x7OckHJY12SGwAm0gO275N0kOoX2jXSPq8gYuISyRdikpjfCtpXmZ+WZn/U1J/Zo530F+jtu/OzKzE+KjcyE41zX16hgBJz0i6v3w5KemJzPyiHO/OzG3t2CWtz8yDpc/bkp5tiJE0mJm7m+D7a5LGABRA/TgGcHOZpX0R8ZKkSQD9AFaSfEXSu9OVgORhANeWzyMRsTczNwJYBqCP5C5Jp8v3X7eq4T2lemXmzsw83shAJz0AAJn5TekznpnvNWVnbVtn25GZeyr1Oynppk4FSLqjulll5lutsC0//HLPHiJ5q6RfSL7a+EGZgYg1rh9IF5PcQ3IHyZxJjPPD/gVl0kVibkfZTAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-parking { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAArRJREFUaIHt2z+MDGEYx/HPrSWSw3FBIRGJRgihUGhcToiCQqUQEREFvdATlQ6FSkSIRnKnuEZCxBU6BRJR+RcRORKFayTLKuaGvXW3s7vvjHt37Dd5is27ed7fb955551n33fpA0ZwA6/xHfUeiRre4zZG2zE6hLEIhOcV4xhuZfZFBCLzjhdYNZfhMo1sc4w1mx2JQFTRMQqVGcMnmq9ACTnZ+OG1hR+BouMdDMwY/o4lXV65XuEHqqnhekCin/jUZY4KBrEioP9OSP12fZtMY0sOQoawB5fwMUBPVvym2wSPcjDbzBKcxpcYDT8owHDKWtwP0Dan4Yp4mcJB3CwieYwjnFLFRIDGnhnhlBqOSR5mwfSCYfiKM3kkCl2HH2Jfi/Yd2NqivS4ZuSeSl59WVPASmzoR2ETwOpw1hy+2mWcKR9oQfDZAa1RzeA3uyC5iJkI7isVwymXzFOszvMK3kA5iM7wcB1q01/EmpIPYDMPGjPZSjTB8zmhfGpI8NsM/Je/PrVgf0kFshq9oPUfXSYqKronJ8DWcy/jO/tBOqqEJMniK6y3a6/gg+cH8eRv5juchKu041mopZVeAzujetLKo4moeiXrF8AXszDNhzLf0qQB9f93SKTEaXoTzAdp6yvA2TOZo9LfhopelThjEXkmJeEhDsZ4nRRs+LBE/HxUswwZsxuKC9RRueDuOFtxHR/TKspQbfcNlp2+47PQNl52+4bLTN1x2Qg0vymiPqRqbRbf15bT5939XS/Zz865pg+rhPA6m1SXbI405BiS7gIWXex0ykBquyb49e50fqKZzOJcDI5HzgT8PrckFFPKveNz4YdTCP1CKjt2NhgdwLwJRRcVdczCsnH/yeIaVcxkmWUrGIxCZ58jOa7aRUdySHJuvRSC83ajhreRA6qw5+9/yC60z6p1+lWcWAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-parks-openspaces { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABJFJREFUWIXtVm2IVGUYPeeZWWfLdQlm2dWkJmN37p2bbeEqYUhYJPYjsOhzMxCVsMSyIDAiIeiTVKxQLCujoA0qgrB+WBQsgSW4aivN3jszmWmmxi7L5o7sx9zn6cfOLtdhKd3p44/n1+V5z3nOeZ9773svcBH/MzhZLZ1OPywiq82sEUC3iDzX09Oz7z8J4DjOdpJrozVVHQGwmuQ8AHNIFsIw3JHP54/8owE8z7teVQ+ej1BVB0kuDYJgbzUBBADa2toudV13l6ruP2+hSB3Jd6oxnwhQLBbfB7ASQOwC9W46nZ5TVQDP8zwAd021gapKVQHCMMxUYX6sUChU9SAKyaNTFotcmU6n93ieVzfVHvHp06f3FIvFMwBmTDHEkjAMtwJ4qHKtpaVltogsBlCjqvvy+XxPJYeO47xMcsNUzCMYFpH6bDY7Eun7opk9KSLxCO9jEVmVzWYHJzZgZiuqNAeABICJ2+A4zrMknyL5OgDHzFwAmwHco6odUSHT6fRoRcoLhqqezuVyMwHAdd2kqv4mIm/4vr8+ynNd9zUAjwG40ff97wBARORANeblJo2e5zVjbKLrRWSaiLxZyQvDcFc58AMTWgDPAAirzEAzW+g4TgfJjQAwOjo6UEmqr6/PA/hBRNa5rrsZAGK9vb1HkslkSPKWahKYGUjebWYbSV4O4GBfX18BAFKpVO3AwEDp5MmTo729vTuTyeRskuuSyeRXAgAkL/QIPgeq2k+yUVXzQRC8UCqVbheR28bXa2tr10TpdXV161V10MzaxXXdJQBOVWE+CGA5gFqSeQBWKBR+8n3/8TKFJN2opqur66yI/CoiMwXAmlKp9LWq9k/Bf0s8Hr+hfB2Y2cLm5ub6KMF13Zsw9rY1OI6zzfO8aZlMpgVA2swOxVV1RiwWW0vyTgCfAGg4T/MjZnZAVfeKyAwzu19E2km+l0ql2hOJxCYAXwBYBuAEgD1mtnxoaOiympqaj8ysX1V3xpLJ5C4RWQTgxMjIyAoRaSYZ/UCFqjpA8pLxgqr+QnKlmW0n2QTAwjBcJyKDJB+pqalZJiKfkXxVVa8ws0UAfhYRkvyAZAOAZfl83qfjOG+TXF1u/GM8Hr9XVWsBXKuqBRFZZWbHSe4GMFdVfxeR06r6lojMi4TK5HI533XddgCbAMyuHJmqjojIxyLydDabPQaMHUSfjhNE5BpV7QawRVVvFpFbzczK4kYA94nISwD2R80BHJ41a1YBAHzf/7CpqekqAEsBfDNOILmBZIPv+w+OmwOAqOq3APxIsxiAxSQXRE+zRCLxvZmlAFyHc/8ld5dKpQWdnZ2l8UJnZ2fJ9/0vVTUb2X1PEARnKqcSD4LgTGtr6/zh4eEnSF5dbt4XhuGOIAhOOY4ztsXDh/vb2toWFIvFVQDmAjhhZn+EYfhuoVAYrmxcnqgXmUDLZJw4AHR3dxcBPO84znySM33f/3wycldX11kA2zKZzB0kj2az2UOT8cY9zewVklsBIAzD45OSAMBxnEcBLCUZN7MYgOiOWs1siGTuL8ymgo4gCDr+nnYR/zL+BLvl+XdYhksfAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-payments { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAtxJREFUWIXF192LVVUYBvCfp1NSmiWWDTMqXjRmfgVZGnYhjTdGJtKfkEjZP9BVgoh62UUQRRcR3VQEfhDiXKURxRB+oSgONAgylRUz2ehIzjini3dtz549ZzvncIaZBzb77LXW2e+z3vd5n3UOc4x56f7dHMQ+gY+r6eENvDmLwV/BBqjmBmczC1VsLxLIsA7vY/EMBqzhLA7ibpFJ8bkXnTMYPMMOjONAfrBSWLQ0F/xDvIqTJS8cEmR/xkSTJF4sm6il+7L0eVi9Q55PY/nrUzyW+/56/NpgXfE6mtbvwidMzUCGRdiYPm8rzP2IdzGaG7uIt3IbaRqNRJgR+wnX0F2Y+6Ik0AWcwUutECjLADzcIDjcfMB3HjTXMoEyvFYy/jheng0CuxuQqOAjoZ0M40IrPbhS9rIyDYzhD/wjjKMidrg0BenF5ziFJ/C2qbv/XnQLHMKXzRD4C2swiBV4BgtEn4/gd6H+dcJYPkvzjbAeT+NvkYWGyAjsx3K8Jw6lNeo+UMQYzuOI2PUxjcXaIbxhOG1G2kRDPIKvTG8k+WsCh/FOk+uH1L3lvhFlGRjDB6JWW7BauOISPJqC3RS6GMAlnBMpvoy+sp0l1FI2bhUnqrkF/aL2l4UBXREiHBUiXJgIrcZOUeNLwnjOT0OgFHkRbhX134jXRQ2LIv0P13EVx/EtXhBd0Qrm42vqQntI/CDpFakdwJ9CG1kJRtP6TqwSAuzCXjzVIgHpff9mDxXRt/dMFs4Iboj2vFOYGxVHdluYl7tvEqndINqqE0+anIEh9RL04zn8MhMEqqIThsWpNiAUP2SqCLtECfIibJsAIcIdQoTdphdhnxBhqc+3QqAdEe5ph0CGORNhluIJ7BMmtFZzIhzUZv2ZrIGaqHG/cMIbwgnvpPkFQoSdeBYr8Zuw7BnBD1o7jGr4pt2g+QxUxEHUg83C8zvUf37fNvkwOi3+YI61S2JO8T/yv+dLyQ3kcgAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-pest-control { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAACQNJREFUaIHtm3uQlWUdxz+HvenKQTYFYbWkFeKy1BiIoniBMKlJRqepNM1R0qmYLKdJKavpKlZqg3crTcxbGCCKF2bTSbFABLqAwsYCgquZkQKCtIvAnv74/p6e533P2d3znnP2HP/gO/POc97n9v5+7/M8v+t74CAOoifUAd8DtgD7gE3AfcD5QP8i5j0c+ALwAPAysB94Ffi+PbMiGAL8BcgAO4CVVmbs2oOYPyPBnFOBh4DOYJ7twAtWZoBVwOCScJAADcB6I+ABIG31/YAJwGy06o7ol4AZQFWOuaqBy4L5MsBm4BpgPJCyfgOA31n7i2gXlAUpYIk9+K6AoFz9pgIL0ZbMAItz9Gmxtv3AfGBKL3PeY/0fK5SBpBhuD3wOrU4+mIHfpnOBG+36rdV1ABfmOVcNsNzGDcuX6GJxGjAwz7634Ldqb9d1ec7ZAJyegN7/o7utUyp8BFgDbABmAdu66TcE+AXQBIwE2vqYrsQYCywF5iD1MQYJrDjORyv37Tzm/LH1PSdHWxXQDFyEjsJzwKjEVBeBzwNdRLfjW8CpsX4nW9vCoC4FDLUr3GFOEB4fm+NjeJXkri7gMyXgIxEGAJOBbyJ1cQCpk5qgTz+gFRE4E7gZeBNP+H+Am4Bv2P3fY8+oA9qRBL8XuALJjzTvAfwGEf2lWP1EZIQ4Jrch9bQYMezqdwHjYmO/am139BnVRaAJmZdbiK7yh4Hd1jYLqA3aaoHvot2xk+i5rANeA94FPtBnVBeJu9GKXG33VWibZpBw6w6XWp/VeOH3A6v7VZ9QWiIMQcKrC5gH3ImInpfH2EXW99dIyHWhLV92uzkpJgD/ICpVx+YxbnxszHrgo31EY8mRAs5DhG9IMG4LOs+fpe+NorzQHzgqj35X4FfqwQTzLwzGXdVLX6fPD0swf2K8jlcts4lKY4c0UTV0c4L578AbFh3IZo6jDvg5Xp+/lmD+nOZgbwQ9ZuO+g9y5eARiOlAP/Nnuc72U7uBU1lPAIWSbmYeiXTAL7yL+MsH8BSONGMpYOTRoc9vy01a+gtzDAT3MVwV8Ea1WBphGts97NLAC75qW3dqqBx7Fb/Hz0ArsQfGn/kSl7j4UEnoQuYy3ohDQScAnYn0PB7YiHzqNfGW3hRfYcyqCFNra7xoxr1p5K3ACnoHVwF8R03Ef+Gp0LBYFdRORjZ3By429SJC9J6R3MyLYhXI+jlw5x0A7ChjUoojJCXY12fgjgH8F/WcgL8ntjAWU2R3MBylE9C4kqH6GjzJmgGfIfY4HAsusz1Irr0fhox1oK+cK/lUcExCx8+3ene+RSPhk0LmciXbEWOBy/DFYAHzQfj9hc8yz+0nlYCApnLF/sd23IV3aD634deQ+w3uBn6BVTCHPaovN4Y7FT8vCQUKsRAbDYKRD95Pt0B+LBM9/gXdQ8ODobuapB45EpuaaUhGZ1PDoDoOREFqNVNRItGLrgz6HobDqm+hl7EOeVRNR87AVrfRo67sKBQOPKQWhpWL4LETkk3Y/2spWxPw8xNyzyGdOI2E1FxkRb6EMxnD8SxpjpZvzk6UgNN9Aem+YZmWLlY7Y44C/IUNhIxJGrSi6AbKVxwCfAi5ApuQ9sTmWAD+yZ9xZInqLQgr4N1IhTn3MJyqULqVngyEFfIWoUHvU2vqhrR3OX1Ecj1crDmFi7GsJ5roqGLcxqHfqaWJRlFKaM3ymlU9bWQOMCNqPBd6XxzxHAI3BfROS9iDvCWTBVRwugD7c7pvJ1rUdKCz7LeRFTUZ547OR9TXO+sTHuaD8MLwlVlHUIH36SlD3OTzBTyLnYhPZzLjrWhSGbUF+7h+CtguCeTcheVBfDMHFSukJSIeGqZQxwe/diKFr0TYfh1bLRTJ2AvcjP9hJ+pO7mesZlDifhN/iiVEsw1MCYhxCIsNoyEaigqg7HBL8bg5+/xExfAZFMFwsXPZ+WFC3Dp9oa0cWWL440cZkkI8dRjwb8dGOiqAKbdn2oK4aEdqGDwp0IYPjIuQN5dLHR6Hz7l5UJwoY7Ce6SzZbW0W+5BlHdhh2lNU9jF7EPmRpxb2jN+zqQAbHKYjZVVa+jM52BuWmHNwnEqcUSnQxetj5qMuCOnfm1iHJXY1U0HiUNFuEjJJOxKzrtxwJsrPRDtiKt6nDc7zcyoIZLkZonWTliqDOOQ0voUjmqVa3Am3RnvA2Pl26Ab0MiDL8fOzZZcUGtFJh3NmZgGOBr9vvNhTR7Ck+XYt07mYbMxP4kP0OVV4V2Xo/EQpd4QFIr65E59ShGTnsbfi48Qj0It5G278VH3Jdhs7rWmRaOryAmN9LdIUPoKDCJGAQyi6WBacjgm8P6qqNQKdra1GMeg8K2zp1E15LkV/cAtyGJPtOvFe0Dr3QMInuPoM6q8Q89Qj3KcLMoG40Xn+6b7gWW51Lezail3Uu8n3DKMYkokHABrxqCyX1ZVZ3ZSGEFyqlQ2kcr6tB0haknsBn/19HhsMjyN8NE2Guj3Mzp+PPfZhfjkdEyoKn0VsOU6c/xG9VJ2jSyDjZDdyAtmEj/kU3oDTLHLT1t+NNy0eC+a4JntOAz2mVDZuMwBAuytFhbS7/cyPZZ3crYvqNWP1sG1OPIpu7rX5R7Fk7gH+Wipl80Ik+awjRioSW+65jutUPxRP+EFr926ztSvxKbscHCs7F56j2kO10rEUSuywhn7QR86egrg5J0zX4VGcYcHNC7kWix+AYpMIyKF3qMNfqpiJz8wBRP9gdqUFFc5MHhtjDlgR1Lq51P1Ihu1CeKXQU7rI+21AG/3oUns3gVxy01bch9VSDZz70ulwaZ1hpWOoZg+xhLUGdS4m4j0gfJqqOwKdWw88h3kFRjhAuR/V7u3efJYY74HGrSxycL0QtbUf68f1BnYs9uZSIc9CnBH1cOKcRSeZp9jv+jfTk2BxrY88AMeq+4yoLXFrzEqQm3D9PjrT2E6397gLmvtfGOkdiIHrB7cj8vBAxu7Iw0gvDaUhthColNDNH4KVyUiywsccFdXNiz+qkAiHbUSgtshwZHaE3lEbS9csFzHs5ch5CqVyN/h+1DH0Xks+XfQcB8D9/Hsdy0mwZyQAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-phone { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAMdJREFUOI2t0jFqAlEQxvEf2ERir9hr6XoDA54lILY21l4lSZ0LiKXYapNGcoMEEStBtNiVrItv3QcZ+HjwmO8/w8zwT9HCEhv0Ys0NrHHOtEMSA/jIma/6Qq0q4HAHcEanKmBRMB4wqmqWJecB/Rgz6RB/c4B2jLmGY/YOs78mPmO7qOM718UskNdVsp0XnEogY38rDt7JxO1A36QzSdyue6fkYieFTkJahwAwwPYBYFUGgCdM8ROo3noEuMYzXjHHHu/S2wEXL21NjJVIrpgAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-pin { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAMCAYAAABfnvydAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAPdJREFUGJVdjr1KA1EQhb+ZGxYt18oqFmIr7Kv4AHJzI2Txp7Cw0WKtbdUqm4Aiwgp2vkUqCxvBwiL4AhbhLsy1SSTs6c6Zw3cGOmqaZnPdC0BVVb1+v18BJyKSm9mXql6FEBoBmEwmtyJy2qWllA7ceDzeAl5ERIGzGOORc24b2E8p7amI7KiqM7NFCOGuLMsfM7sHUNXdXpZlnzHGhapu1HV9ISKvwPly5V0AptPpA3DY/QHwukTdANY5frdt+6wA3vsP4KlTqEajUasrp6qXwC+Amc0Gg8EjwH/Bez9PKV0vp45FJAG4dWZRFLM8z+fD4fBtlf0BHlVRk4NpdCMAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-planning-and-development { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA+hJREFUaIHt222oZVMcx/HPPcbcGeaOy73G43TRlMaYMF5I5CER3ZSHRHlO3khIkufmDeKF4Z08FuWFl5QkjaEwirhEIiYiimbUZBjuvceLtXWOc/c+Zz+sc849x/3Wbp/WXuu/1u/stf/7v/7rHJbIzQS24AfUF+HxMda3DnqkpNhj8TqOaiqr46+S9mJTw754F6dXNXYqfhUEbsWlyecPqxqOyCphTLuqGroQexJjL2E5jrf4BK8QxvRbFSM3YjYx9JjG4zCUgjcnBuZxR8u1oRK8D57ScEhXptQZGsEr8UrScDfOzag3FIIn8F7S6GdsalN34AUfiC+SBl/jmA71B17wlqTyR1iTo/5ACV6WUvny5LwTj+YwfkhT/YHkb8Xj1j9xTj8Gm0GhOzwivG+vzWl8Fu/ju7Kj6zezyTHIZN7hWkFD64T4uV+sxeoqBtKmdBabBE/8JG6v0mlJxvEVtuPsmIazpvT5+r+or+PLHBoKOa1OzAleudeMYL9uGM66wycKYh/vRqc5GMfveDNH3UKRVjsvfaSwguoXayy8y8uTstGmsmiCq7IMx+HwSPbu9d/n+/6kPNprqQoX4Xt8jh+FpeehFW3uElJO8IeSOayid7iGa3BbctwqLCj+ZRWele5xf8HFZQbZxF2Jrc1NZV2d0ldYKGRHcu00fJNyvfV4HmMF+mymkOAYU3o8pWwCD+JtndfTcB1mRMghd6Jbz/AY7lHMox8tfEEPCUn0rtBLp5WHGu7GB4I370oHi5GThIzLLcpvB6USQ/BhEWyksQJPCHtYsd7blQSvxgt4INJYsjgPn+GyGMbKCj4Dn+LqGIPIwUF4GS/igCqGygi+D29hqkrHJblKeH1tKGugqOBR4QXfT2c3hZvKNi66Ht6LaZwiBBTNib4Z6RHapPazYS5pW0+5doRGvP2TEKLuFqZ2NIqEljuEgX7bps4G7cPKrW3aTjfVy0or9TS03Juc59vUmetgI2/bKD+nWKyBR9dYEjzslMlapjGBC4R9qVY2dmg7JWy2p3npqPln4gkex2sl267DG5HG0ZFYgjsxr5EFaWZMvj3oaPRK8KtCEq+VtUJir2f0ymllBTJpz3xX+d956SXBw06vBGflpXr+hVf10nlXVdPYllI+2YW+2lJV8Db5sg+jOLNCP3N4J6V8EicknzfiYGH7JpOqgu9MzmdFsJXFTjwi/DqwlYeFrR64RFj/3tDOWNVB7sHNFW1U4Rlhd6MmRHNPlzGy9LOlYSJtSteFL2KlPoR+kdg/OS9IH6UJnsHJGjvrg8wnrQVpAcF6PCfs4kfdyOoh88Ifta7XPqM6/PwDtYBOHzK0wKUAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-planning-development { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAhhJREFUWIXdlj9rFVEQxc+ZjTZBGxEEG8EiYC9il84HFmqpX0CxFtIIERurFFop5AuIiAoW9oIoiZAmjX9Q8IERFIIoKcw5Y/MS4r7dl93H2yhOd+fO3PPbe2f2XuBfMdvTkm5KepGZy3sqnpn7BsLbtlfaUwOASxFxugR1vkvhzFyNiLdbAKdIlmMedQzwBsDM1GC8vxxgeyEifnQhbvsKgOlth6TFHLYjXYgP9FYk9YFBDTQx2z0Ax8YRJLlG8nHVXGOAzLwF4B2Ab3UxEXHZ9r2K3LMAKgEANDsCSa9sz4yClOQaf780bn8EJGcjYmNUTEScbLredk7jwF3EASAzv3YGYPui7QO7ALzvDCAz50geH7lYRNEWoHENAIDtO5K+l9yvi6KY3xpIWuwMgOQDAB9K7k+lmKF2y8zepACek1ypm7f9syiKp2W/pNo1G9dAEyN5uG3ORAGatGqnAJKe/VWAiDjTNqdNEaqmDf8MkoaKEEBtFba5C85l5jwARcTdnXO275O8CuB6ROWmrrcCsG2Sv3b6IqIv6UtEbJZbUdIGyVWSa00/qBLA9jLJC0VR9OsSAMxm5o1S3tivpy2ABACSCxFRK07yCYDNCv9tAK1vwp0A64OFDo4KjoglAEvjCI0EIPkQwDXbC5KOkvw8SZGyZeahIaftOUmqeJp1YpI+AgBLECcA9HY7igntwsuIaP3n/P/sN+GGkyoOFcw6AAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-planning-permission { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAWRJREFUWIXt1r9KXEEUx/HPqigxi1bBVHYihDQLBgM2pgrmGdInL6DY2uiTpAko+AZWCwFBy41dAoYQwSIG/yFrip2Lw3phdxzv2uwXLjP3zMw5v/lzhmHIE1OL6tPYxFuMVhTvGrvYQru7cRu3A/rWi6DxClxhHI1HmWs5r/AFTSzBWNQ4HsrDCgUU8SYKw0imw/d4neMgR8A7HIT6R529XUl1Mta7SylLIfgfnOIDVmVmT3FCe/FGZw8vozHHWMRkj7ELof/+QwU0QpBz91PrB5Z17pO+BaSegQus4VlJ2yye42WKw9Qz0IrqJ9gJ9U+hrOF7lQJifuJzl4Bkcu+BbB6yAnuh/BXZNkJ5lCOm3zTMITsLHp2yLfg9yHix4R/qmKlQQMHfAcRI40zai6bVNf4FbhJ97HG3BfVEwfPyM6bOXRZUnX5ltGMB355AQDP+mQuGtupfxNf4iqkKJzdkSP/8B32Wh3d8rO1eAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-plus-btn { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAALdJREFUSIntlzEKwkAQRf/MLggWuYSVhUU6wTNIbmFv7qEXsVG0FgTBCwghh4idYLVjYb/+IgiS+fXjvYVlixWwq/clku6yTLAVNtWZ0UU6bDKCyiTP2JjVKR3ueR72sIf/Pyyoj1cOtQKQWZ5JDaAPxhYBLLiwEIxOOdcQ79jDP1sEcKHIhAKKMstYukO0Y3TMG/lsfZhD9PbldEtsqxOjG94de9jDHu5t/N8phReCtVnGwpPVvQFqECBTt0uUJgAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-recycling { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABTNJREFUaIHtmmtoHFUUx3+bbRJtIEt9VVGjjVX7Ukv9VGpRK7X4QEREi0UQfKTSClKxPhAJqWARrW+IihpUfBVfRStKQa0o2C+22H6waFWiRi2NSZv0Ed1dP5wZZna6M/fOfWyI9A+H3Z2d+5/zn5l77znnXjiC/zcKDrkuA+4CzgWqQDmwisb3MjAI9AEbgRGHfjlHAXgaEWlqzwNTAr75wBrgLeBNYBVQaowUPazDXGgF6Ap45gJbUs77CehoiBoFrsHuyd4b8CwG9ivO3YzbLpgb7cAA5mI/RwTMBPZptlnZCGFpeCjFKd1XeS7QAmzL0W4EOL0B2g7DyahfwSx7LeB5wKDtJt/i6qHPwNHQ9gOnAqcAo4YctyX8KQCzPegE5FUsGzpaRaYcgDstOIaRm1YKeHYCN/oSvMnC0d+BtoCnBPxlwbWTaLDbCjT5EHu5hYNV4OYE3+2WfKEt8aCVIrDDwql6T6EIbLfgrOJxELvO0rFLUniXWHBWgHlOVcZQAJYiYV5exzYouDcacFaB112Jy0IrkhUNajo1Bpyl4JwJ/KPJF9ohYJo7WWocAzweXDjLsac0+Z5R8CTtCUc6cuMMYH2KU4PIjdHB1Skc9WwYOM6ZAg0U6xybD3xFrWOrNLhKwHPIAKQr+H5Tx8N0ax4S305Fpo5i8Bm38FiIW4AX63BeC6wNHJuN9OE0nAD0IFFTUdNGgUVIiBpHM7AamAUsyxIdooP0BLye9QNHp3A1A9N1LuoIC6iNEa7SbdgKvIC+6NUuvTbAFKQ8lOwOvxCFsErchL7gQaJaVKNxA/BHhm+P6ZC0kD+weMShCB10Ap9o+PUvktllYoUGUdIOILmtbzQjo3OewsMWMrKoyZjXqF5yLC6JBZgnGXekkd5jSBi+Pr4qDm3oh7H1bC9SkqpBCdhjQVpFnSDYwKSrxe2VJGG3Bdlu4GDw/QLnUgVN5IsRklYmERf0W5BdAZyG3MUvvcgVnI9dLW1tnMyU6N2EU+dRp784hM0a1tY40XcGBCNIDNxItCOFQBPBNbF3lwHB3T6VZWBpDh/jtjdO0gR8nKPxdmCSV1nZ+DTFryw7rNg3GfhIo2EFWOhRjE5sfibRzKBrNTNIETgbyY+XA7syGvbZ6VHiSfQynW70xb4dNoqvt3Yhr3ZvcNIsJPjuQO76UcH/Pcjc6wMzkAF0GvCr4txWpGup8u5DAe/PyT/CTGkbUs2Yms9XJ/gQudlzNM9fjPrpPhxvkFxRX0a0lAmSTAwgsXITUaJdSZjqWC9Se87CpUjaB/K6/kBU1mlKfBaRN+EzZB/I9SmcfyL9fV/aRQvAt5gN+1mmWrk3WXIZAk4ETgL+TjnnVsV1AbulD1PBpotqL2e0z7WiaLMkmldwCRkETXjLSH+fhNSx4v8t0hULEqjnqRPbCH7UkvvVgGdN7NgHecSGeKMBgqejXqpR2QEkxl4Y/B5DBqrc6Awa+xT8niP+K4Hjg+/rskRldepdyBKIL1yErCe5QCeyIrEHCYxSoRrFesiYwyzR7pDrIBINdiPTVSpUgncjg4oPbADeccT1PVLG7XVB1obdFsOsPpwVNOjaEBJXa0FnYh4F7tMlzIkBog2mpngWGemdowv9TaC6TxgknN1syPsFksV5w7FIJf99ZGPYEDJgqGy5gncG6oR+GPgR+Ca4/gqk305YPEgkbgdwMXAO0s8ntLA0tBAtaq/3dREv+xMNMYakc1XgN18Xqbc5ZTzRj+z76Ae+HmdfGoZ24MLxduIIJir+AxpeBxVEOaVgAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-red-arrow { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbNJREFUWIVjvCsk+Z9hAAHTQFo+6oBRBwxNB0gsXcDAaWczcA7gdHRgkFyznIE/LZmBgZGR/g5gYGBgYGBmZhBub2YQndjLwMjONgAOgALe6AgGyY1rGZjFxAbGAQwMDAwcpsYM0vt2MLAb6NPHAT9OnMQQY5GUYJDatoGBJzSIZAcw53PyNpCi4evaDQyMbGwMHBZmKOKMLCwM3D5eDIxcnAzfDx9lYPhPXB3HSG5tyOXuyiA2bRIDkwA/hty3vfsZXqVmMvz7+Il2DmBgYGBgkZNlEJ83k4Hd0ABD7ve9+wzPfIIY/r58idcMyhIhvnLg71+iooFsB3B5uDHI7N+F1fffdu5meOrqzfD31SuC5rCQajEjKyuDUE0FA39OJlb5DxMmM7xr64KEABGAZAdIrF3OwGlthSH+/8cPhtc5BQxf1m8iyTySHcBhYoIh9ufpM4aXMQkMPy9dIdU40h2ADn6cOMXwMj6F4e+bN2TppygXfFq4hOF5YCjZljMwkBkC///8YXhbWcvwad5Csi0m2wHf9uxl+DhzDsOPo8cptpyBgcKSkBpg6LUJRx0w6gBqAwCG83XEHk/cPAAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-register-to-vote { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAadJREFUWIXt1jFrFEEYxvFfjBGjCIISsRLs7CxMFxtBq4CNTUjQ0sLGQoNgk29gJ5JWyBdIoSiBEIKlAVGxSSkKIYkiaoLm1mJncVxvL5u7Ya+5B152mH3n/T+7Mzuz9FnDierMYglDWElUs7YeIItirl/wb02biOHLOI0XTZkow4+H/tEmTFTBC5VNPGwSXugcdkPep6bhY3gX8n5jqp/w6RTw+13AM9xKAYevoeBPnK0Jz/Chg9kD6W5U9BVO1IAX8SiFgQm0KkyU5/xOyH8c9V3qBX4E70OxzcjEKs7jrfYLbhTr4d4aDndrYC4UaeEy7kUmfoXrnvar/WqUO9sN/IK/m8l81B+b2MNMhxpPQ94P+Rv7T0MVA4tzfQKfg5kdLGIE4ziGbbxpM34Hkzgp/xpO4SWu1TVwG09CewHPQnu4w5hYrRBwHTdC+6b8reyrLe0/q17jYxlU9TRZuH6Xr/BeNSKfsl0crTOgcDyZAE4+BZl8bfyjQ4kAXWtgYGBgYGC/jeg1NhJwzuCiA2xExSmYOr6UQVU/CjO4ot7BU1cZnpc7/wCT6cCU79LBIwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-rss { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAmVJREFUWIXtlz1oVFEQhc+bXWMKjURFREOEEGKUNGIhoohVChvtBBvBTrTQQMTKXgWxkXTaKfhDsLMQREFMEVDUgBjUKP6iBIX4E8w5Y5OFy+QuZHeja5Gp3t5zZuZ7dy7LfYW7O5oUkmjNal6JRYCmA5Rzi5LGAAwDaAPQBWCzmXX9FQLPBMnrGah1kg6SvEWSubxag+TMvAECTAfJ8yR/NApQ1xkws7elUulYURTdkq7WU6MShfvcPyJJz4qiuAxgEsA4gFEzm6xWRNJed79kZu21NJfE7AgyWyV3H5U04O6rqxTbQHKs1hHMCyAkTZE8K6ktA7GS5EjDACTfk7xA8gbJ51U87yT1Rwh3X0HySaMAI6Fop6QTJF8FH939ZJVxfFkwgASkLOkwycngP53x7ltwgOQNO0jeT3MkHY8+ktfqBXgt6YikfknLq+xGK8mbaTF33xlHR3K6ZoBg+kXyiqS+DEQLybuJd1zS0rALQw0BJObfkk65exEg1pL8XPFJGgx674IAJElDmTNxKNE/untr2IUHdQGQnCH5La5LOhreskRyPNH3B8DBmgFIXnT39tkCu0hOJNp3SetDk4FEHw7alpoASD52dwtFtgXPubALnYn81d1LYYd+1gIwZ86zs5xKPJ88HEiSLyu6pJ6gPcoBVLsP9MYFd18GoKXy28zWANgYbE+T556gvck1ygKY2W5JB5LmhaQzZrYkQHWH1A/J86pQM3ufyF5IAECSA7gDYALAdjPblPHcBvAiWdphZn2z2j0ADwFMA5g2sz0AtoZ8VgX4F7H4afZfAJQlsYn9Z/4AEips3GLrJ/oAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-twitter1 { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAzVJREFUWIXtlktoXGUYhp/vmzFJU6suFBVDJlM6kypYpBEsitZWuo1idHJpwU1FRFBRcFNRu7EbRRAv4CVC0MQTU1y6KBgvKylVsaBlJpkkvRAEiQRbMzhzvs9FmGmmc+kZTDaSd3U4//t/z/tfzvl/2NT/Uq+64i5RrJFMUXT7VD5RCvUlce9HpAsogJ90149yv3V/ylExANwlFZx9KKfd02QkrATYcfxclxRtf24oMdYqvDdY6A8JxxXdWtfgfsLFXhbR/ZgfQuTr7GDyWQAte7QUHhQPR1MTc4+2Ak+N5+8J8amGcACRA0LsB1yOmYtJe+FIV3B2S1UAN9+NakzUv0gH889EWkN3QXhX4ZooYc1tUWOMW6FjdAulTHUAlbbVJ1XgndTkfJD+7MKNzQqmJ/J3impfFDiAit6KyzERFnOZ5FhVAIXZtWZBHkeLuXQw98Idk79fW6+ga/yuqPDLnXgtm+l5DhGvChDix2sjcwPIm6Vw5Vw6mHt7R5Dfu3fa45dHZPGaPs1kdiE71HO0DIcrPsN0kJ8CHbhKmQLws5vPiEonEH3Tms9kh5Opta8qI0hNLNxvcX2eUvEWRe9rUqYD2CMqeyKDK5KlK99UlkDUDvNPcU5cu1ovHJXPTMMA5nyjqnEREhsWAD/ZMMClzrYA9/MbBwfHpxsGWOy/7W93HWF1k22AbDY3mPylYQCA3HDiew/tQXPOrDvf9YO1n1/dAACmWowhr+B8uW5wY7k9lA/rNdX8SERsm6OT6wYHEF4/fTDxZ72mmhmYGdz+rbt9vI74n7Yt//FWo8aaAADXLS897c77/5Vsxl/EfOTUU3cXG3maHrk7Jxf6zO0Jx/sEvbclOBTV/OHscPKrZr66M1DWmUzilAujsnpEt0C3FVwGrgaHBjOQ+GSuo72DfYg8idsjqEa+OxrMuzMwO9TzYxS/AKQ+zz8gLoccrhekB2UXq4dOZJlZSUXei2vnkV8zN1+M2q8yst4g3+smL5r6SNP7XQ2ZZRfGicsbuccS+VZCVwUoa9fY4tZCW+EAsM+c3ahvB71JsRjoRYMlhSxwWtxOXJL4d+cHu1daBW9qU2X9C5vuMU82LX5KAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-twitter2 { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAbZJREFUWIXtlz9LXEEUxe9cthCJmDQBMRYS0mwtdgZBP4IIQiCIhY1VQHsri0AgWCQfIkUgxiKxMBGrfIDY2cQFEUkhNso5J80Kw7LzZ9eETbGnnfvu+c1582beBEmyAcoHaT4EGAL8FwCNv9WI5C8zOzQzmtmcu09HY3T37pNVRgC+5Majum1Jjaink3wF4BvJDQD7qWeTAABuJI2S3CqYvy8kswbgB4DbXgFaUZMlAL+71ZF8kjKX5JIeAXid8iklMBJBPAawC+A6qjkvrQ0AOymPLEB7di+7RDpGcgXAOwAfKgAu+gIAcA5gj2SzZJKSJG8n2RdAq2yRF8mnOXNJSm5E7j5BcuE+ACGEuWJRjg7AKcmpfgEAfC4lkAVoQxyQfN6rOclnAND3K4h04u7fewWQtJPcfjsKSwmQ5Hov5iSXS33vVASIQI5IrlaYzwC4qu1bdRyTvHT34xDCx1ydpEVJX939QW1auX3gE8kXJGcVnXSJHg8BvKlZdJ0qfYY/SW6SbEoKHaYjkuYBvE0dVDUKUt29gOS1mZ2Z2Y2ZjZvZZNUqL6ga4F9p4P+EQ4AhwMAB/gAfzZih0m/1IQAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-warning { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAw1JREFUWIXtV0FoHGUU/r4367ZN0CRNYF2N88/sbrZCSeNB8CYVxIP0KgYFFaSFUsSbtIcecimIvSgtNDmIVxXBqqB4MgevwYCghkjihtSLYbMRQtLMvOehybaT2WRnNoqXfrf//9/3vW/ez3szAzzE/wzvKNzKaOX00MjQ8Waz2epVhL2QQj980RB/LJSnAACm3xej6LVf79xZy6sleQnOuWfM4m/ayQGA8tK2V/w8rxaQ/wpkaHDwK6H4+w9IhEODA41mq/VTLsE8wVU/uCTgswedG/hBvVwfyaOZuQJjo6NPRsAXJI8dFEOgL/aix9dbrS+z6mauwA4LH4nIY3trM3xnsLfN+I4Cv983wTeqzr2QVTdTF4R+eI60r+8n10+XGo3JvXW9XB+JCls/Q6R0L0AXpFg8s7i4uN1Nu2sFSqVSPy2+kdg07+aDy4U/F/4y4WftDUo93tm50k07k4H+4okpiLgEifFmKtD4aGKpdjkIglNHMhAEwYSKvZvOxbH9e4SGCWGRY4xx6ygGRFSnBSykDABPp01JLWVKcLbi3Fs9GQh9/yIoz3U8NEsYcM4dJ/BEx1Dw+mGzoaMB3/fLZrh2EImWrEBBtYoDOorA8M4jW9dzGSiQHz7Y82mW1BMJPS9V/oQJyptV585mMlBx7mWArxwmCOCEc67dGWpW7RIPU7tVq9VSUzRhoFwu90F5c39QJ3jWNilQnutKEDnVaTYk7i107n2C72UxAMBMMWtiwwKOZyGo6jY8mVheXv4tZSAcDcfN07lObfdvwhQ/LK0st98Ve1dA0mbyJDfYTGRaMeXzUP0jK2//bCAAVP3gghHTWUVU9W+3Ep6cxWwEAIEfnBdiJrt5rMWmY41GoykAoERq3B4GEZHV2mr7W4K0XNdGYLhAvgoAhd2Nch4BAP3x3egT59xUAQgMvJqTD9udnPcqAMzlFSAx6YG/GPgt8j8AYDbfNkDllMKi3CK9QnXeb4S3gd1vwvWN9cbJgYEfjRwnUEKP/wsZsAnY7Zh8fb41v/Ef5XiIfPgHNBbtxGowZa8AAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-your-community { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABJhJREFUaIHtmVuIVWUUx3//tR1twMzQSseSCKu3zAwru7xUDxUZdKHLBF3oAqVh0Us9zYNdUCoiKimMhKAgEqQXMay0rCnKEhGMXoxqJptJp6YGnemcr4e9T7PPPvs255ztZWb/4ePA/tZa3///7W+vvfY6UKJEiRIlShw30FFebybYCuGWAacCBx3qheqHwMhR5lI0bKWwQ8JczBgEe+hYM2wbhN5IEBoZeuVYc20DbFU+sf4Ae/BYM24FM1OOcdIYBDqLImRFBQ7CrwBmT9BpDnjXF8EGChYs3EXN+VWXtptLDQXfYWY26XdyW1mEULTg35pxcqi/3URqmNai/0nAucAo8CNQDU86bLtwTYStfhJz0QvWmhasdaSJwE2jU+glYf+Esms/2KMROwnbM8Es/U00BtgTwn4P2QwLrcPf8MLRIezTlOJhbcR+ubDRnGIPA3WJTujVlLU+wr/zRcIeyy4euLjex7tZ2EiG3zB4N0QWuypHofJwoXKF9eYoEV+McT1f6ANhYxH7UaH3gHMa19L6HKdix0T4N5O0zsphszDm2g8Odwu42eAtxf9a+gMq3wJ/tXmtRCQJng7edeDmQfULYE9org/oyoj7a8rcEFS25eTXl8MmutZisEtBfVDZAoxlBZgvbG/kiD47Pm1P5niGl8fEPQ3sAaENQh8L+0pom9CbYPcCcxpdvGtyPMOratZC6yLzu/11UyD0boKIKwOTGT7ZxOf3tUjIhUIbc2TqI7545kf4bEzx2Ql0BJtzdQKftzIE24EEx56Q2Sz/TtUloCGwp6jroli3sOEciSc8/gTv1vBtFuqJxBkVWk+odBV6JiHe/izBe+McY4oK8BPPFcAyYEb9VPbRTxnVmPU6gUuAy4FTGqnY4wmxooVMg+N9MU59gbicsDtaEBsS7d2Yf03mxp1OsDvzEL5H2G4/gDYBiyIGi4SeE/alsF+E7Q/epcJPekNtEOyEDeAnMxPaJOwnYT8L2ym0Bjg7wus8oc3yy9Dvwe6awIbFokNorbB/Y57xFyCrFGxm+KWq0Osx82OB8FY/gugALsTPzPNCYjcnEQMuwG/p/N1ewXYIPz9clrIp7zNeU3cFvBfn2QgvSDYDoWA9wQ6vSSHVDwi8m9osNthM71rAS3tUwJ4OeK4NXT8AtpqE734JvRMJNArMBRYo9T2qLTk2pQXBNTG2I8VuBL/I6BJWifDbQPC6DCm3u0Hd9XvgPgMGwbr5/wUfi1oJuCDrCDUD4c4M+KSVmp1gtwdceiMR7ge7DUKCBXHv2e+CBeNKxTBGg9+iPshrbdvULsc4T7ercY6VUH+2l0SNHDoYmJ+ek1hR/1XV4mb1i87wjTQQM7cE6gVPjzGq9aiKbva1Capl6mrMZCecMELah1LwZEcpeLKjFDzZMeUEhz6f3MuN05ntkeMU+hqqUT1VCAl2uNWNjpVCaRWHylYHW+NmptyRnnKCc/WCHNVHwJuVbFHN85dIy3C458HeTraoDGXFyNv82nWcPM/7oLKvlQBT7khPOcEt93PDcGi7cIfbGTOI+3l2s6NEiRIlSpz4+A/WNV5K2nKPxwAAAABJRU5ErkJggg=='); background-repeat: no-repeat; }
-
-.icon-your-council { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA51JREFUaIHtmE+IHEUUh79Xr2YjSyQbcReSyF6yYiK4Kl4iDHtyPUWYgx4WD4J4UAQh9z2EYG4iEdSLlwUFQUHxJjKCAWPALEQxmmVRFI1ERY1/YiC7U/U8TPdMT+9EhPROa6Y+GJj69avfe6+np6soSCQSiUQikUgkEonEf4QGjbvqrmFUTDrckhP3Sd2FjASHf9KJO6fiv6+7llGxG0DFr9RVgBtxvksjzreFUTcM0IgwDczWkHuk7FXRYyr+ooo3Fd8R8e8o+iAgdRdXGR6/oOLfUPGbWaNDPrru8EeAqe2up9I76/ELEeaz4SQSHxXc/D9OGuQK2Otm0lu2Ip1Xgd+rqrHShlX0ZZCnqvQM5u6AjfWq/LQinxkR/7Ygj1DxTXRiS4ILRjxdiV8VJsAO4A+wryvy6xHhFDBRlV/Vj/SLIE9X6RlMb4erX1blV8c6XCsCUNVmXnD7gFur8Opj5w3buH4b90qk85IHENzd1224bchBqeKfJ7YHG8NHeqwb/hmzRbCVXDBjGbNWb0xcxWwxwvv9mPiYGUeGeL+Z+X1T0jcz/YWtU+z57jViSV/P8r5VqO0ZM3k8H0d4D7NFI57tT7OHwI5dq+GrgdA2k69yQbBPA+Fkv2H3SyC0HfzQT9T4yMHqkOK/DYS2YX+VLsQsz9qWGebOB0IbsAEd+7Ob174rFH4mIqcL44vdfO7XXAuEDzA+u1bDY4EvfJ/w+KaJzeb7EUPuVLSTBwhxSvHNANP5nXJs3hdxt2x9j8o+j28aNlm+kOXZX973iMQ5b75p5QnIzq4Xe3MtIvOOzuX8N4sw4/HNSNyVa4reb8gBGfACVHw5xw2IHQ8WlsfukS42vGHEk8W3qhHPGfFUIeZSN4afCjEfG3HYTu1CFnvl35dj69mcMpczvXfaacSzRjxTiPkxi/mtEPMh2Bdb3LKThwsADr/cO4lADwNT+VjEv5vFv5ZrsGPO45tDTjGeA8iOZYv6mooeVdET5TmOxhOZf2dAF7fa1ftzPP4QTBwoxK0AiPh2vzZ2KvpwlvfZbn8jJiJrwcLRYP7EqHPDGC5LY9dwcR2+SdEWwsGeIhxy5nb1h3HGoS0j3ibZvXKEByLsLq/DEZlTtAVyc1EX4p7MY6ZcjEi8R01blBZoQaYUbUVkf/4LRVhwxN4uLsKsdn2n6dXmDiPcO+hFWodvaDyAWVyqu5DtRtHPA6HuMhKJRCKRSCQSicT/hb8BeUhgRd2jICYAAAAASUVORK5CYII='); background-repeat: no-repeat; }
-
-.icon-your-environment { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAABbdJREFUaIHtmn1oV2UUxz+bW2tNzRxpL2K6RliRSUGUWYIWFGEmkaUQBb0ZROkfYWUU0QtiUYGt1EoqozcyhHLDkGgVWqvRGComvbjSzJfU3Nxce/n1x7m3392z5+3ePb/1wr5w+O2595zzfM/uveee89wHhjCEIfyXUTQIcwwDZgBXAOcD44EKoBP4DdgKfArUAq2DwKdgGAE8DOwBchppBw5EvzngKLAKmPhPkB0orgV+pX+ArwGzgbGK/inAHOAN4CDwEFA8SFwHjCfpfzVrgDGe9mOBzcAG5C75V2M5+tv3phQ+qoHuyO4rYHhgjsGwEH2wOWBTCj/XKbbrwtIMg/OAPzEHfMBgdzGSuZOYqbG/KzzlgeETzMHmgC81NncCvdH51cDI6PiFGvuDwKjC0U+HqdiDzQFzFZtq5D2c1PkFuA141OBjSYHj8MZq7MEu19jUOGx08mMhg/BFEbAXM8k16Ku5nyw2Njk3FPFFwPtIwZAGZ1rI1QElBrsui51N7kjJ7wRgKbAWSax/Y1fksAd4D///5NUGYt+TT0I6mMpNlzztyQsks29L2PbJAfcojnc7CMeYbyA222G3wmAXSzvwUURyEfBZdPxVD04ANyv+WoETkwojgCOK0jsejk0BVzvsTkV/lTcDt6AvKd8EXvHgVAUcUvzW6BSf1xBY6HB+lcYmBzQhzUC5xfYMYCVQj2T66Y65GoFlDp3yaO4kl15gkk55HNChKHcB0ywTVKEPOJajSE6YhfTFWTEx8ne7Q+91DYd3bQZPaQz2ILegCb4J6GckV5gytw1PRD7OtujcrZnzGPImMaICqXhUw03AcQabVRp9mzTSvx+2YThSi++w6FxG/8oth7SqTsw1EI1fCSX07W0vMujb5DnD3BXADcALyKOwGHg8slmc0CsFTo7+riT/Wk1KC/Yc0gf1Gge9yNrU9Gi8nnw23ZAi2D+AS5T5qoCXgDbDvPsTc81Eqrst0XitYR61frdiCvkmPCm7gbPIV0pfINXMJOR5cQW7EzgnMU858Az21jIH3BrpzyC/BrYGSWI6/fo0wcZ40eCsDilD4/F6JAMvcJDeAZye8F+FXCXXPynOslOQAiI+fl8i+KR0A5OzBHwSsM9Aopa+hcrSyGaZhfi8hO9RyDPmCvZz5C4YjWT5+HiDMvbJD16Y50Eqfs6mRjZLyDf2qjQBjyEJ0OVzHfK4gKxm+vBoQRLfgPC152SN5N+xV5K9BWxFKry4rZyG+R9oetYHhHtTkF2RIFqOFP47PW0PI+XtaYm5J6CvC3TSQaBl3dH0byxsUoskpBhFwKXAI8gr5BtgO3J71yFZehZwvGJzI+YcopOXQwQbI81VziGZ8i3cXZMO8+nbx/rI78jXi6B4OyWJ+DZb4Om/Evg4wxydyIe64ChFrlqWRHS/w/dIoDmD33bgmkDxaVFM+mYhvsUvsPjN4rMVdw8dBEW4l2h0YlpBGUP6Rb1WJBEOGopIf1UOoV+y9S1uYmnDvihRMBQhr4I0ZHXN+LMp7NuAywsVkA+KgY34E56j8ZHG/vrCheKPyfgTfkBj71tJZWr5VITYVtCM//ffCcq4hL6lpA0rfQnZEGofxQeeeupaVqUnhy7gw1SMDAgV8EZPPXX7gm+x30CgLU2hAt6CrEG7oK5N+86v+6CeCaEC7iG/qGZDu2NsQlM6OmaE3Au13UNnrzLej2RgF75LT0ePkAH7fKH/QRl3IiuhIXx7IWTAPsS3aY5tddh0IP1uEIQMeJ+Hju5Z/NZhY9rylAkhAz7iOH8YWd9S0ehhFwwhA3ZlXNOt2+yw68jAxYiQAfc4zu8yHG8ZoN9UCBlwmeP8McPxTmRFxITSbHT0CBmwa2ug6YtAGfaP5EG3HIYMeLzjvGkZ1WU3joA8s2w/MKEB+dRRosiw6NeUxbuBB6Pfrui3WxmXETh5DWEI/xP8BeZCqdJPni93AAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
-.icon-youtube { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAU9JREFUWIXtlrEuhEEUhe+5s41IhELjEWj2KVQiEZ1Ss7WIROM9CBqJSoFEJOINdCRKjSjUCpV7joZks+bftfOzf/Pfcu7MOV8mM/deRMSRNRORUupBkppwJxkppY43Yd4fLUAL0DhApypB8grArZm919CfkrTi7suVO5QJkls1TH8Eyb1Bj4j4yAJExJMk/CWAJI+I5xxA7g08ABhaHSXNjQMAgGZ2n8vlAGKUIMk7khvjQFTpFv0Cd58HcBoRlyQXSjRqAfSBrEp6JLnZCMAXxCyA44i4ITkzcQAzM5KvAPbd/W3iACRP3H3R3c9LzldWwl8YvwDopZSuSzXMCm+A5CGAJXevZW6Wv4GRUCmlnQKvlFvMmXX/oxSbWbcqmWtG238MsFvVjIZNxWeSLgAUt2NJ05LW3H19MPc9FbdjeQvQAjQO0CF50JB3mJl9AtNWAlL9SJ6EAAAAAElFTkSuQmCC'); background-repeat: no-repeat; }
-
diff --git a/web/cobrands/harrogate/icons/icons.data.svg.css b/web/cobrands/harrogate/icons/icons.data.svg.css
deleted file mode 100644
index 76a8edba4..000000000
--- a/web/cobrands/harrogate/icons/icons.data.svg.css
+++ /dev/null
@@ -1,157 +0,0 @@
-.icon-arrow-down-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229.9%22%20height%3D%2218%22%20viewBox%3D%22-46%2042%2029.9%2018%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-31.7%2059.6l-14-16.2c-.1-.2-.2-.4-.2-.6%200-.1%200-.3.1-.4.2-.3.5-.5.8-.5h7.5c.3%200%20.6.1.7.3l5.8%207.2%205.8-7.2c.2-.2.4-.3.7-.3h7.5c.4%200%20.7.2.8.5.2.3.1.7-.1%201l-14%2016.2c-.2.2-.4.3-.7.3-.3.1-.5-.1-.7-.3%22%20fill%3D%22%23ffffff%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-down { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229.9%22%20height%3D%2218%22%20viewBox%3D%22-46%2042%2029.9%2018%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-31.7%2059.6l-14-16.2c-.1-.2-.2-.4-.2-.6%200-.1%200-.3.1-.4.2-.3.5-.5.8-.5h7.5c.3%200%20.6.1.7.3l5.8%207.2%205.8-7.2c.2-.2.4-.3.7-.3h7.5c.4%200%20.7.2.8.5.2.3.1.7-.1%201l-14%2016.2c-.2.2-.4.3-.7.3-.3.1-.5-.1-.7-.3%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-left-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2218%22%20height%3D%2229.8%22%20viewBox%3D%22-595%20552.2%2018%2029.8%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-594.7%20566.4l16.2-14c.2-.1.4-.2.6-.2.1%200%20.3%200%20.4.1.3.2.5.5.5.8v7.5c0%20.3-.1.6-.3.7l-7.2%205.8%207.2%205.8c.2.2.3.4.3.7v7.5c0%20.4-.2.7-.5.8-.3.2-.7.1-1-.1l-16.2-14c-.2-.2-.3-.4-.3-.7%200-.2.1-.5.3-.7%22%20fill%3D%22%23ffffff%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-left { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2218%22%20height%3D%2229.8%22%20viewBox%3D%22-595%20552.2%2018%2029.8%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-594.7%20566.4l16.2-14c.2-.1.4-.2.6-.2.1%200%20.3%200%20.4.1.3.2.5.5.5.8v7.5c0%20.3-.1.6-.3.7l-7.2%205.8%207.2%205.8c.2.2.3.4.3.7v7.5c0%20.4-.2.7-.5.8-.3.2-.7.1-1-.1l-16.2-14c-.2-.2-.3-.4-.3-.7%200-.2.1-.5.3-.7%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-up-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229.9%22%20height%3D%2218%22%20viewBox%3D%22-46%2042%2029.9%2018%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-30.3%2042.3l14%2016.2c.1.2.2.4.2.6%200%20.1%200%20.3-.1.4-.2.3-.5.5-.8.5h-7.5c-.3%200-.6-.1-.7-.3l-5.8-7.2-5.8%207.2c-.2.2-.4.3-.7.3H-45c-.4%200-.7-.2-.8-.5-.2-.3-.1-.7.1-1l14-16.2c.2-.2.4-.3.7-.3.3%200%20.5.1.7.3%22%20fill%3D%22%23ffffff%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-up { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2229.9%22%20height%3D%2218%22%20viewBox%3D%22-46%2042%2029.9%2018%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-30.3%2042.3l14%2016.2c.1.2.2.4.2.6%200%20.1%200%20.3-.1.4-.2.3-.5.5-.8.5h-7.5c-.3%200-.6-.1-.7-.3l-5.8-7.2-5.8%207.2c-.2.2-.4.3-.7.3H-45c-.4%200-.7-.2-.8-.5-.2-.3-.1-.7.1-1l14-16.2c.2-.2.4-.3.7-.3.3%200%20.5.1.7.3%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2218%22%20height%3D%2229.9%22%20viewBox%3D%22-105%2066%2018%2029.9%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M-87.3%2081.7l-16.2%2014c-.2.1-.4.2-.6.2-.1%200-.3%200-.4-.1-.3-.2-.5-.5-.5-.8v-7.5c0-.3.1-.6.3-.7l7.2-5.8-7.2-5.8c-.2-.2-.3-.4-.3-.7V67c0-.4.2-.7.5-.8.3-.2.7-.1%201%20.1l16.2%2014c.2.2.3.4.3.7%200%20.2-.1.5-.3.7%22%20fill%3D%22%23ffffff%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-arrow { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2218%22%20height%3D%2230%22%20viewBox%3D%220%200%2018%2030%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M17.667%2015.69L1.475%2029.723c-.165.142-.37.217-.575.217-.13%200-.26-.03-.382-.09C.2%2029.7%200%2029.37%200%2029.006V21.52c0-.29.128-.56.347-.74l7.182-5.81L.346%209.16C.127%208.982%200%208.71%200%208.42V.937C0%20.573.2.242.518.088c.315-.153.69-.104.957.128L17.667%2014.25c.205.18.323.442.323.72%200%20.278-.118.54-.323.72%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-balloons { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eballoons%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M44.387%2049.026c-1.417-.816-3.028-1.74-4.628-3.234-2.927-2.73-3.13-7.373-2.96-10.062h2.028c1.126%200%201.897-1.138%201.475-2.18l-1.836-4.555H32.8L30.96%2033.55c-.422%201.046.35%202.18%201.48%202.18h1.474c-.186%203.234.154%208.677%203.875%2012.148%201.843%201.717%203.605%202.73%205.154%203.622%202.733%201.574%204.24%202.44%204.58%205.942.072.74.693%201.29%201.422%201.29.046%200%20.095-.003.14-.007.786-.078%201.364-.775%201.286-1.56-.47-4.964-3.148-6.506-5.985-8.14zM26.018%2042.66l-1.837-4.555h-5.665l-1.84%204.555c-.42%201.046.353%202.18%201.48%202.18h1.477c-.185%203.234.156%208.678%203.877%2012.15.276.256.627.384.978.384.382%200%20.764-.153%201.047-.453.54-.574.51-1.474-.067-2.017-2.93-2.73-3.13-7.373-2.96-10.062h2.03c1.132%200%201.902-1.135%201.48-2.18zM22.633%2013.813c0-1.222.145-2.404.395-3.54-.55-.098-1.107-.162-1.68-.162-6.128%200-11.098%205.737-11.098%2012.813%200%207.076%204.97%2012.81%2011.098%2012.81%204.633%200%208.6-3.282%2010.26-7.937-5.205-1.925-8.975-7.46-8.975-13.983zm-3.125%203.524c-1.507%200-2.734%201.53-2.734%203.41%200%201.05-.854%201.902-1.91%201.902-1.055%200-1.908-.853-1.908-1.904%200-3.978%202.938-7.215%206.552-7.215%201.055%200%201.91.853%201.91%201.904%200%201.05-.855%201.903-1.91%201.903z%22%2F%3E%3Cpath%20d%3D%22M35.64%2026.623c6.126%200%2011.097-5.736%2011.097-12.81C46.74%206.736%2041.767%201%2035.64%201%2029.51%201%2024.54%206.736%2024.54%2013.813c0%207.076%204.967%2012.81%2011.097%2012.81zm-.968-22.95c1.057%200%201.91.854%201.91%201.904%200%201.05-.853%201.903-1.91%201.903-1.507%200-2.736%201.53-2.736%203.41%200%201.05-.852%201.902-1.91%201.902-1.055%200-1.908-.852-1.908-1.903.003-3.98%202.942-7.216%206.554-7.216z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-benefits-assistance { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Ctitle%3Ebenefits-assistance%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M25.4%209.1c0%20.9-.8%201.6-1.7%201.6H8c-.9%200-1.7-.7-1.7-1.6V4.9c.1-.9.8-1.6%201.7-1.6h15.7c.9%200%201.7.7%201.7%201.6v4.2zm0-8.9h-19C4.5.2%203%201.6%203%203.3v9.5h25.7V3.3c0-1.7-1.5-3.1-3.3-3.1zM6.9%2017h1.7v-1.6c0-.3.2-.5.6-.5.3%200%20.6.2.6.5V17h1.7c.3%200%20.6.2.6.5s-.2.5-.6.5H9.7v1.6c0%20.3-.2.5-.6.5-.3%200-.6-.2-.6-.5V18H6.9c-.3%200-.6-.2-.6-.5.1-.3.3-.5.6-.5zM3%2021.2h12.3v-7.4H3v7.4zM19.8%2017h4.5c.3%200%20.6.2.6.5s-.3.5-.6.5h-4.5c-.3%200-.6-.2-.6-.5s.3-.5.6-.5zm-3.4%204.2h12.3v-7.4H16.4v7.4zm-9.3%204.1c-.2-.2-.2-.5%200-.7.2-.2.6-.2.8%200l1.3%201.2%201.3-1.2c.2-.2.6-.2.8%200%20.2.2.2.5%200%20.7L10%2026.5l1.3%201.2c.2.2.2.5%200%20.7-.1.1-.2.2-.4.2-.1%200-.3-.1-.4-.2l-1.3-1.2-1.3%201.2c-.1.1-.3.2-.4.2s-.3-.1-.4-.2c-.2-.2-.2-.5%200-.7l1.3-1.2-1.3-1.2zM3%2028.6c0%201.7%201.5%203.2%203.4%203.2h9v-9.5H3v6.3zm16.8-2.1h4.5c.3%200%20.6.2.6.5s-.3.5-.6.5h-4.5c-.3%200-.6-.2-.6-.5s.3-.5.6-.5zm0-2.1h4.5c.3%200%20.6.2.6.5s-.3.5-.6.5h-4.5c-.3%200-.6-.2-.6-.5s.3-.5.6-.5zm-3.4%207.3h9c1.9%200%203.4-1.4%203.4-3.2v-6.3H16.4v9.5z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-bins-recycling { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ebins-recycling%3C%2Ftitle%3E%3Cg%20fill%3D%22%23FFF%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M25.255%2010.63h-2.497l-1.78%202.234.147.278c.034.075.066.117.074.13.006.01.017.013.026.022.22.322.672.775%201.023.775h3.005c.118%200%20.214-.097.214-.216v-3.01c0-.117-.097-.214-.215-.214%22%2F%3E%3Cpath%20d%3D%22M22.89%209.78h.984c.08%200%20.152-.043.188-.115.038-.07.033-.155-.01-.22L22.426%207.06c-.04-.057-.107-.092-.178-.092h-2.98c-.085%200-.165.052-.197.137-.032.082-.012.175.053.235l.635.592c-.187.193-.432.547-.432%201.09%200%20.56.71%202.058%201.43%203.427l1.66-2.082c.138-.186.29-.38.47-.587M31.837%208.5l-1.725-2.496c-.067-.098-.2-.123-.298-.055l-2.347%201.625c-.05.033-.08.084-.09.14-.01.06.004.117.04.164.48.648%201.15%201.56%201.597%202.177h2.61c.055-.098.11-.195.16-.29.035-.052.065-.1.088-.153.017-.03.026-.053.03-.06V9.55l.002-.004c.055-.163.147-.735-.067-1.045%22%2F%3E%3Cpath%20d%3D%22M28.914%2010.5c-.242%200-.5-.013-.768-.043v-.893c0-.094-.06-.176-.15-.206-.092-.026-.19.01-.242.088l-1.623%202.44c-.044.067-.048.154-.007.225l1.523%202.708c.038.07.11.112.187.112.015%200%20.03-.003.046-.005.09-.022.158-.1.167-.194l.075-.96c.12.043.268.077.43.077.256%200%20.495-.08.714-.23.447-.31%201.33-1.744%202.115-3.13h-2.09c-.12.008-.243.014-.376.014M21.214%205.762l2.58%201.22c.03.013.06.02.092.02.024%200%20.05-.005.073-.014.05-.02.096-.058.12-.11.008-.016.52-1.116.92-1.96L23.264%202.14c-.29.04-.725.302-.86.59L21.11%205.476c-.05.107-.003.234.104.286%22%2F%3E%3Cpath%20d%3D%22M28.663%205.788l1.354-2.57c.04-.077.03-.173-.03-.243-.057-.066-.15-.09-.235-.057l-.865.32c-.082-.254-.284-.623-.773-.854-.14-.066-.567-.27-3.33-.27-.324%200-.673.005-1.022.01l1.68%202.693h-.003c.097.162.193.33.282.507l-.325.173c-.087.047-.132.145-.11.242.026.095.11.162.21.162h2.976c.08%200%20.153-.043.19-.114M16.62%2026.784c0-.894-.727-1.622-1.62-1.622-.895%200-1.623.728-1.623%201.622%200%20.896.728%201.627%201.623%201.627.893%200%201.62-.73%201.62-1.626m1.145%200c0%201.53-1.24%202.77-2.765%202.77-1.526%200-2.768-1.24-2.768-2.77%200-1.526%201.242-2.77%202.768-2.77%201.525%200%202.765%201.244%202.765%202.77m-1.34-19.42V5.823c0-.16-.127-.287-.285-.287h-3.605v-.7c0-.158-.13-.286-.287-.286h-6.71c-.16%200-.286.127-.286.286v.7H.286c-.158%200-.286.127-.286.286v1.543c0%20.16.128.287.286.287H16.14c.158%200%20.286-.127.286-.287m-5.196%2019.37c0%20.83.28%201.587.744%202.197H5.888c-1.527%200-3.673-2.743-3.673-4.153V15.82c0-1.36-1.527-3.703-1.527-3.703V8.49H15.55l.017%2014.686c-.23-.044-.468-.07-.712-.07-2%200-3.625%201.625-3.625%203.63%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-business-and-investment { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ebusiness-and-investment%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M40.093%207.032H19.907c-1.232%200-2.235.997-2.235%202.223v6.986h4.47V11.48h15.715v4.763h4.47V9.256c0-1.226-1.002-2.223-2.234-2.223zM59%2050.793v-29.47c0-1.754-1.43-3.176-3.194-3.176H4.193C2.432%2018.147%201%2019.57%201%2021.322v29.47c0%201.754%201.43%203.176%203.194%203.176h51.612c1.763%200%203.194-1.422%203.194-3.175zm-21.763-5.526c-.32.425-.83.7-1.405.7H22.277c-.638%200-1.233-.35-1.54-.91-.306-.56-.287-1.238.058-1.778.51-.808.96-1.646%201.354-2.497.485-1.067.887-2.153%201.213-3.22h-.85c-.12%200-.242-.013-.364-.038-.8-.166-1.393-.87-1.393-1.71%200-.837.6-1.542%201.392-1.707.115-.026.236-.04.364-.04h1.692c.677-3.682.594-6.54.588-6.59-.02-.478.16-.935.492-1.278.332-.343.786-.533%201.265-.533h8.675c.97%200%201.757.78%201.757%201.746v3.258c0%20.967-.786%201.748-1.757%201.748-.97%200-1.757-.78-1.757-1.747v-1.51h-5.18c-.05%201.207-.18%202.928-.51%204.91h3.052c.97%200%201.757.78%201.757%201.746%200%20.965-.786%201.747-1.757%201.747h-3.807c-.434%201.607-1.01%203.277-1.782%204.91h10.605c.97%200%201.756.78%201.756%201.746-.01.393-.14.755-.363%201.047z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-business-investment { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill-rule%3Aevenodd%3Bclip-rule%3Aevenodd%3Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M31.2%209.2h-6.8v4.3c1%20.5%202.2.5%202.6.5.5%200%201.1-.1%201.6-.3%201.8-.6%203.1-2.3%203.1-4.1v-.4h-.5zm-7%205.3c-1.1%201-2.6%201.5-4.5%201.5-1.6%200-3-.4-4.1-1-1%20.7-2.2%201-3.7%201-1.8%200-3.1-.5-4.1-1.5-1.3.4-2.6.5-3.3.5-.4%200-.7%200-1-.1v13.2c0%20.3.2.5.5.5h24c.3%200%20.5-.2.5-.5V14.8c-.5.2-1%20.2-1.5.2-1%200-2-.2-2.8-.5zM16%2023.7H6.6v-5.8H16v5.8zm9.4%203.9h-5.2v-9.7h5.2v9.7zm-4-24.2H16v4.8h7.1l-1.7-4.8zm8.8%204.9h1.2l-.6-1-2.4-3.6c-.1-.1-.3-.2-.4-.2h-5.5l1.7%204.8h6zM15%208.3V3.4h-4.3L8.9%208.3H15zm-13.2%200h6l1.7-4.8H4c-.2%200-.4.1-.4.2L1.2%207.3l-.6%201h1.2zm22%2015.4c.3%200%20.5-.2.5-.5s-.2-.5-.5-.5-.5.2-.5.5.3.5.5.5zM7.6%2013.5V9.2H.3v.5c0%202.4%201.8%204.4%204.2%204.4.6%200%202-.2%203.1-.6zm1.1-4.3V14c.8.7%201.7%201%203.1%201%201.3%200%202.3-.3%203.2-.9V9.2H8.7zm14.7%204.6c-.1-.1-.1-.2-.1-.3V9.2H16V14.1c1%20.6%202.3.9%203.7.9%201.5%200%202.8-.4%203.7-1.2z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-car-service { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ecar-service%3C%2Ftitle%3E%3Cpath%20d%3D%22M56.95%2022.156c-.194%200-.393.028-.592.084l-2.252.636-2.34-5.84c-.66-1.655-2.62-3-4.363-3H25.52c-1.744%200-3.702%201.345-4.365%203L19.408%2021.4c.026-.29.04-.582.04-.877%200-3.385-1.782-6.532-4.65-8.215-.153-.09-.33-.137-.512-.137-.578%200-1.015.464-1.015%201.075%200%200-.017%204.735-.016%206.313%200%20.165-.193.362-.273.422l-.057.044c-.923.788-2.087%201.675-2.602%201.95l-.096-.002h-.103c-.52-.274-1.704-1.176-2.64-1.98l-.06-.044c-.002-.002-.226-.186-.226-.542%200-1.642-.016-6.158-.016-6.158%200-.71-.498-1.083-.99-1.083-.188%200-.384.053-.552.15C2.776%2014.002%201%2017.146%201%2020.524c0%203.96%202.388%207.36%205.765%208.766v16.104c0%201.902%201.508%203.45%203.363%203.45h.192c1.855%200%203.364-1.548%203.364-3.45v-16.1c1.133-.47%202.173-1.17%203.063-2.083.216-.22.42-.45.61-.69l-.94%202.353c-.616%201.537-1.117%204.14-1.117%205.8v11.604c0%201.34%201.064%202.432%202.37%202.432h3.098c1.308%200%202.372-1.092%202.372-2.433V43.38h26.644v2.897c0%201.34%201.063%202.432%202.37%202.432h3.097c1.31%200%202.373-1.092%202.373-2.433V34.674c0-1.662-.5-4.264-1.116-5.8l-.378-.944h.285c1.308%200%202.372-1.09%202.372-2.432v-1.36c0-1.15-.772-1.982-1.837-1.982zM20.52%2026.61l3.538-8.834c.396-.99%201.574-1.8%202.617-1.8H46.25c1.042%200%202.22.81%202.616%201.8l3.537%208.834c.396.99-.133%201.8-1.177%201.8h-29.53c-1.042%200-1.57-.81-1.175-1.8zm7.897%2011.174c0%20.535-.427.973-.95.973H20.75c-.523%200-.95-.438-.95-.973v-3.306c0-.535.427-.973.95-.973h6.718c.522%200%20.95.438.95.973v3.306zm24.642%200c0%20.535-.427.973-.95.973h-6.718c-.522%200-.948-.438-.948-.973v-3.306c0-.535.426-.973.948-.973h6.72c.52%200%20.947.438.947.973v3.306z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-castle { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ecastle%3C%2Ftitle%3E%3Cpath%20d%3D%22M51.346%202h-4.78c-.896%200-1.622.737-1.622%201.647v1.957c0%20.91-.727%201.646-1.623%201.646h-1.34c-.896%200-1.622-.737-1.622-1.646V3.647c0-.91-.727-1.647-1.623-1.647h-4.78c-.896%200-1.623.737-1.623%201.647v1.957c0%20.91-.726%201.646-1.623%201.646h-1.34c-.898%200-1.624-.737-1.624-1.646V3.647c0-.91-.726-1.647-1.623-1.647h-4.78c-.896%200-1.622.737-1.622%201.647v1.957c0%20.91-.726%201.646-1.622%201.646h-1.34c-.897%200-1.623-.737-1.623-1.646V3.647c0-.91-.727-1.647-1.623-1.647h-4.78c-.897%200-1.623.737-1.623%201.647v9.349c0%202.206%201.763%203.995%203.938%203.995h.074v40.84h14.693v-6.453c0-2.366%201.89-4.284%204.224-4.284%202.33%200%204.222%201.918%204.222%204.284v6.453h14.694V16.99h.075c2.176%200%203.94-1.788%203.94-3.994V3.647c0-.91-.727-1.647-1.624-1.647zm-23.39%2043.788h-9.172V39.52c0-2.705%202.053-4.898%204.586-4.898%202.533%200%204.586%202.193%204.586%204.898v6.268zm0-14.888h-9.172v-6.267c0-2.706%202.053-4.9%204.586-4.9%202.533%200%204.586%202.194%204.586%204.9V30.9zm16.51%2014.888h-9.173V39.52c0-2.705%202.054-4.898%204.586-4.898%202.532%200%204.585%202.193%204.585%204.898v6.268zm0-14.888h-9.173v-6.267c0-2.706%202.054-4.9%204.586-4.9%202.532%200%204.585%202.194%204.585%204.9V30.9z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-close-btn-dark { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%22-483%20485%2032%2032%22%3E%3Ctitle%3Eclose-btn1%3C%2Ftitle%3E%3Cpath%20d%3D%22M-478.7%20486l-3.3%203.5%2011.5%2011.5-11.5%2011.5%203.3%203.5%2011.6-11.6%2011.6%2011.6%203.3-3.5-11.5-11.5%2011.5-11.5-3.3-3.5-11.6%2011.6-11.6-11.6z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-close-btn1 { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eclose-btn1%3C%2Ftitle%3E%3Cpath%20d%3D%22M4.34%201L1%204.46%2012.54%2016%201%2027.54%204.34%2031l11.598-11.596L27.534%2031l3.34-3.46L19.333%2016l11.54-11.54L27.533%201%2015.935%2012.598%204.34%201z%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-close-btn2 { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eclose-btn2%3C%2Ftitle%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20fill%3D%22%23000%22%20d%3D%22M0%200h32.582v32.582H0z%22%2F%3E%3Cpath%20d%3D%22M10.554%209L9%2010.61l5.368%205.368L9%2021.346l1.554%201.61%205.395-5.395%205.393%205.395%201.553-1.61-5.368-5.367%205.368-5.37L21.343%209l-5.395%205.395L10.554%209z%22%20fill%3D%22%23FFF%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-consultations { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Econsultations%3C%2Ftitle%3E%3Cpath%20d%3D%22M53.98%2021.473H41.066v-10.45c0-2.715-2.236-4.947-4.957-4.947H5.957C3.237%206.076%201%208.308%201%2011.023v18.113c0%202.715%202.236%204.947%204.957%204.947H8.89l3.697%204.948c.207.35.627.49%201.047.49.42%200%20.77-.206%201.047-.49l3.697-4.947h.556v10.45c0%202.715%202.236%204.947%204.957%204.947h17.726l3.697%204.948c.206.348.626.49%201.047.49.42%200%20.77-.207%201.046-.49l3.697-4.948h2.934c2.72%200%204.956-2.232%204.956-4.947V26.42c.007-2.722-2.222-4.947-5.014-4.947zm-36.294%2010.03c-.42%200-.77.206-1.047.49l-3.07%204.038-3.07-4.037c-.207-.348-.627-.49-1.047-.49H5.82c-1.324%200-2.37-1.045-2.37-2.367V11.023c0-1.322%201.046-2.367%202.37-2.367h30.154c1.325%200%202.372%201.045%202.372%202.367V29.135c0%201.323-1.047%202.368-2.372%202.368H17.686zm38.735%2013.03c0%201.322-1.045%202.367-2.37%202.367h-3.632c-.42%200-.77.206-1.047.49l-3.07%204.038-3.068-4.038c-.207-.348-.627-.49-1.047-.49h-18.29c-1.324%200-2.37-1.045-2.37-2.367v-10.45H36.11c.976%200%201.887-.277%202.65-.767h9.77c.7%200%201.255-.555%201.255-1.252s-.556-1.25-1.254-1.25h-7.676c.206-.49.277-1.046.277-1.672v-5.018h12.913c1.325%200%202.372%201.045%202.372%202.367v18.043h.006zm-6.7-5.296c0%20.697-.556%201.25-1.254%201.25H29.48c-.698%200-1.254-.553-1.254-1.25s.556-1.25%201.254-1.25h18.986c.692-.008%201.254.553%201.254%201.25zM30.384%2025.09H11.47c-.7%200-1.255-.553-1.255-1.25s.556-1.25%201.254-1.25h18.914c.698%200%201.254.553%201.254%201.25.07.697-.556%201.25-1.254%201.25zm-20.17-8.494c0-.696.557-1.25%201.255-1.25h11.373c.698%200%201.254.554%201.254%201.25%200%20.697-.556%201.252-1.254%201.252H11.47c-.7%200-1.255-.555-1.255-1.252z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-council-tax { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ecouncil-tax%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M33.665%2041.155c-.287.135-.607.2-.962.2-.275%200-.853-.13-1.737-.395-.88-.265-1.588-.4-2.125-.4-.476%200-.965.08-1.464.232-.502.154-1.006.358-1.52.62.95-.713%201.652-1.435%202.102-2.162.444-.727.674-1.46.674-2.206%200-.207-.02-.41-.05-.6-.033-.193-.09-.463-.162-.802h3.16V34.48h-3.666c-.54-1.05-.897-1.784-1.066-2.19-.17-.41-.252-.808-.252-1.192%200-.783.27-1.448.805-1.996.537-.546%201.325-.823%202.37-.823%201.07%200%201.868.293%202.393.875.526.588.79%201.44.79%202.57h2.064c-.022-1.664-.458-2.947-1.31-3.857-.854-.91-2.11-1.36-3.772-1.36-1.768%200-3.124.456-4.067%201.38-.947.92-1.42%201.96-1.42%203.12%200%20.328.027.634.08.92.05.285.116.538.19.757.082.232.25.596.5%201.1.25.503.372.734.372.697h-1.754v1.163h2.47c.14.346.24.622.298.823.1.32.146.6.146.838%200%20.835-.256%201.606-.77%202.318-.512.71-1.193%201.36-2.03%201.948l1.103%201.584c.47-.283.854-.487%201.152-.6.51-.193%201.044-.29%201.61-.29.612%200%201.444.175%202.5.518%201.053.345%201.807.512%202.253.512.605%200%201.188-.128%201.73-.388.326-.163.697-.413%201.116-.75l-.928-1.508c-.37.255-.642.423-.82.505z%22%2F%3E%3Cpath%20d%3D%22M29.622%206.165L1%2026.965h6.824l.36-.263v28.193h42.868V26.702l.365.263h6.827l-28.622-20.8zm0%2041.017c-6.788%200-12.285-5.5-12.285-12.28%200-6.783%205.497-12.282%2012.285-12.282%206.787%200%2012.284%205.5%2012.284%2012.282%200%206.78-5.497%2012.28-12.284%2012.28z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-crime-and-emergency { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ecrime-and-emergency%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M29.943%2013.63c1.023%200%201.85-.83%201.85-1.852V5.964c0-1.022-.828-1.85-1.85-1.85-1.022%200-1.85.828-1.85%201.85v5.814c0%201.022.828%201.85%201.85%201.85zM14.572%2018.05c.367.436.89.66%201.42.66.42%200%20.84-.14%201.186-.432.782-.657.885-1.823.23-2.607l-3.733-4.453c-.656-.783-1.82-.887-2.606-.23-.783.658-.886%201.825-.23%202.608l3.732%204.454zM8.57%2031.58c.882%200%201.662-.63%201.82-1.53.178-1.006-.494-1.966-1.5-2.144l-5.72-1.01c-1.003-.177-1.964.493-2.14%201.5-.18%201.006.492%201.966%201.498%202.144l5.72%201.01c.108.02.216.03.323.03zM56.716%2026.896l-5.723%201.01c-1.006.177-1.678%201.137-1.5%202.143.158.897.938%201.53%201.82%201.53.106%200%20.214-.01.323-.03l5.723-1.008c1.005-.177%201.677-1.138%201.498-2.144-.177-1.007-1.136-1.68-2.142-1.502zM43.89%2018.714c.53%200%201.054-.225%201.42-.66L49.04%2013.6c.658-.784.555-1.95-.227-2.608-.784-.658-1.95-.553-2.605.227l-3.733%204.453c-.657.783-.554%201.95.228%202.608.347.292.767.434%201.186.434zM5.71%2047.984h48.467v8.907H5.71zM29.943%2016.06c-9.575%200-17.338%207.768-17.338%2017.35v11.845H47.28V33.41c0-9.582-7.76-17.35-17.337-17.35zm-13.64%2025.493V33.41c0-7.178%205.57-13.067%2012.61-13.597-4.023%203.173-6.622%208.07-6.622%2013.597v8.143h-5.986z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-crime-emergencies { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ecrime-emergencies%3C%2Ftitle%3E%3Cpath%20d%3D%22M27.653%2019.056c-2.095%201.856-5.014%201.983-6.518.284-1.506-1.7-1.03-4.58%201.065-6.436%202.094-1.856%205.012-1.983%206.518-.284%201.505%201.7%201.028%204.582-1.065%206.436m-8.276-8.85c1.207-.584%201.317.806%201.317.806l.586.476-.732.804-.512-.55s-1.61-.29-.66-1.535m-2.78-1.537s.367-.22.403-.695l.036-.475s1.024.22%201.243.987c.22.77-1.134%201.39-1.683.183m-4.537%202.744c-.512-.366.366-1.756.366-1.756s.183.476.586.622c.402.147.548.183.548.183s-.622%201.427-1.5.95m-.81%2011.277c-1.335%201.757-4.224%201.81-6.452.116-2.227-1.692-2.95-4.488-1.615-6.246%201.335-1.756%204.223-1.808%206.45-.115%202.228%201.692%202.95%204.49%201.616%206.245m.042-9.812c.95.804-.44%201.536-.44%201.536l-.402.695-.95-.586.4-.622s-.108-1.72%201.392-1.024m20.487.586c-2.306-5.89-7.354-4.245-7.354-4.245s-1.244-1.28-1.94-1.94c-.694-.658-1.463-.146-1.463-.146l-1.207%201.244h-.402s.22-1.903-1.83-2.305c-1.645-.44-2.45%201.244-2.45%201.244s-.184.073-.55.183c-.366.11-1.024.695-1.024.695s-.402-.403-1.793.292c-1.39.696-1.39%202.488-1.39%202.488s-.987-.695-1.792-.95c-.805-.257-1.28.51-1.28.51s-1.208%201.72-1.464%202.38c-.055.144-1.17-.074-1.865.255-.828.392-5.487%202.232-3.475%208.27%202.158%203.84%206.584%206.217%2011.157%203.656%204.574-2.56%201.903-7.72%201.903-7.72s.84-1.352%201.317-2.34c.476-.988-.146-1.426-.146-1.426l-1.353-.952s.915-.622%201.244-1.097c.33-.475.33-1.682.33-1.682l.55-.402.218.33c.22.328%201.28.913%201.464.877.183-.037.11.292.11.292s-.622.476-1.17%201.208c-.55.732.035%201.5.035%201.5l2.122%201.828s-.44%202.636.366%204.32c2.304%204.498%207.28%202.962%208.23%202.56%201.27-.537%206.22-3.44%204.903-8.926%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-elections { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eelections%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M11.018%2045.675h10.047l1.376-8.19h-9.7l-1.722%208.19zm3.312-6.226h5.792l-.716%204.26h-5.97l.894-4.26zM23.693%2029.45l-2.082%201.225-.196%201.172h-5.63l.843-4.02h4.71l2.913-1.695.027-.16h-9.152l-1.622%207.73h9.476l.713-4.253z%22%2F%3E%3Cpath%20d%3D%22M24.718%2026.45l-4.984%202.902-1.3-1.253-1.294.788%202.274%202.41%206.516-3.837-1.212-1.01zM58.524%209.784L56.076%206.88c-.643-.764-1.78-.86-2.542-.216l-2.11%201.787%204.776%205.67%202.11-1.787c.76-.645.856-1.786.214-2.55z%22%2F%3E%3Cpath%20d%3D%22M49.476%2021.165l-2.11%201.775%206.844%2028.3H5.136l7.25-29.977h22.193l3.04-2.473H10.446L2%2053.712h55.347l-7.87-32.547z%22%2F%3E%3Cpath%20d%3D%22M50.496%209.237l-19.284%2016.33%204.777%205.67%2010.827-9.17.008-.008%202.38-2.017%206.067-5.138-4.776-5.668zM27.264%2033.816l7.486-1.82-4.492-5.33-2.994%207.15z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-envelope { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2228%22%20height%3D%2228%22%20viewBox%3D%220%200%2028%2028%22%3E%3Cpath%20d%3D%22M28%2011.094V23.5q0%201.03-.734%201.766T25.5%2026h-23q-1.03%200-1.766-.734T0%2023.5V11.094q.688.766%201.578%201.36%205.656%203.843%207.766%205.39.89.656%201.445%201.023t1.476.75%201.72.383h.03q.797%200%201.72-.383t1.476-.75%201.445-1.023q2.656-1.922%207.78-5.39.892-.61%201.564-1.36zM28%206.5q0%201.234-.766%202.36t-1.906%201.92l-7.313%205.08q-.156.108-.664.476t-.843.594-.812.508-.898.422-.78.14h-.032q-.36%200-.78-.14t-.9-.422-.81-.508-.845-.594-.664-.477q-1.422-1-4.094-2.853T2.69%2010.78q-.97-.656-1.83-1.805T.003%206.842q0-1.22.648-2.03t1.852-.813h23q1.016%200%201.758.733t.742%201.766z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-error { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eerror%3C%2Ftitle%3E%3Cpath%20d%3D%22M8.498%2011.435l2.937-2.937%204.406%204.406%204.407-4.406%202.938%202.937-4.406%204.407%204.405%204.405-2.938%202.938-4.406-4.408-4.405%204.408-2.937-2.938%204.406-4.405-4.406-4.407zM5.65%205.048C-.306%2010.672-.575%2020.063%205.05%2026.022c.1.104.2.207.302.31%205.793%205.794%2015.188%205.794%2020.982%200%205.794-5.794%205.794-15.19%200-20.982-5.677-5.68-14.84-5.815-20.68-.302z%22%20fill%3D%22%23221F20%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-events-celebrations { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eevents-celebrations%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M44.867%2028.895c-.636-.895-.905-2.02-.713-3.15l.382-2.256-1.62-1.6c-.025-.023-.047-.05-.07-.074C30.44%2032.278%2029.03%2049.048%2029.165%2057.28c.004.3.232.55.527.576.295.028.564-.173.624-.467%203.422-16.85%209.893-24.812%2014.55-28.495zM20.54%2017.645l-3.742.847-1.432%203.598c-.026.065-.055.13-.084.192%205.842%208.356%208.885%2025.416%2010.1%2034.01.03.202.207.347.408.333.2-.014.357-.182.36-.385.147-18.536-2.658-30.904-5.488-38.627-.04.01-.08.023-.12.032zM46.14%2047.658l-.53-.738c-.43-.597-.685-1.277-.767-1.975-4.083%201.1-10.225%203.918-12.188%2011.044-.106.384.08.79.437.96.358.168.784.052%201.008-.277%202.142-3.14%205.99-7.286%2011.732-8.128.003-.01.006-.02.01-.028l.3-.86zM16.942%2040.462c-.373.528-.87.972-1.467%201.286l-.8.42-.11.905c-.034.273-.095.537-.176.79%203.427%203.916%205.954%209.294%207.48%2013.155.103.26.382.398.648.322.265-.075.43-.34.385-.616-1.352-8.07-3.716-13.124-5.96-16.262zM48.526%2022.178l-.712%204.2c-.03.168.04.337.175.437.076.056.167.085.258.085.07%200%20.14-.017.205-.05l3.732-1.985%203.732%201.984c.064.033.134.05.205.05.09%200%20.182-.03.26-.085.134-.1.202-.27.174-.436l-.713-4.202%203.02-2.976c.12-.118.163-.295.11-.456-.05-.16-.19-.28-.355-.303l-4.172-.613-1.866-3.823c-.074-.152-.228-.248-.395-.248-.168%200-.32.095-.395.247l-1.866%203.823-4.173.613c-.165.024-.303.142-.354.303-.052.16-.01.338.11.456l3.02%202.976zM19.73%2013.98c.164-.036.292-.163.332-.328.04-.165-.017-.338-.145-.447l-4.44-3.755.543-5.826c.016-.17-.064-.332-.207-.42-.07-.045-.15-.068-.23-.068-.083%200-.164.023-.235.068l-4.905%203.11L5.13%203.99c-.056-.024-.115-.036-.174-.036-.103%200-.204.036-.286.105-.127.11-.182.283-.142.447l1.41%205.676-3.828%204.39c-.11.128-.14.308-.077.465.064.157.21.263.378.275l5.775.4%202.948%205.036c.08.135.224.218.38.218.01%200%20.022%200%20.033-.002.167-.012.313-.12.375-.277l2.162-5.43%205.648-1.28zM58.118%2045.894c-.024-.167-.14-.307-.3-.36l-2.714-.89-.813-2.766c-.047-.162-.182-.283-.347-.312-.025-.004-.05-.006-.075-.006-.14%200-.272.067-.356.184l-1.677%202.335-2.853-.074h-.01c-.164%200-.315.09-.39.238-.08.15-.066.332.033.47l1.678%202.333-.95%202.72c-.056.16-.017.34.1.46.084.087.198.134.315.134.046%200%20.092-.006.136-.02l2.715-.893%202.264%201.754c.08.062.173.093.268.093.067%200%20.134-.015.196-.046.15-.075.245-.23.245-.4v-2.885l2.35-1.636c.137-.097.21-.264.185-.432zM13.76%2038.417c.15-.078.242-.235.24-.404-.005-.17-.103-.323-.255-.395l-2.586-1.222-.47-2.845c-.028-.167-.147-.304-.308-.353-.042-.012-.085-.02-.127-.02-.12%200-.237.05-.322.143l-1.948%202.108L5.162%2035c-.022-.003-.044-.004-.065-.004-.143%200-.28.07-.362.19-.096.14-.105.322-.024.47l1.382%202.526-1.274%202.582c-.075.15-.058.333.043.468.086.112.216.176.352.176.028%200%20.056-.002.084-.008l2.802-.548%202.035%202.024c.084.083.195.127.31.127.048%200%20.097-.008.144-.024.158-.057.272-.2.292-.367l.35-2.864%202.53-1.333zM32.49%2014.267l-.34-.843-.883-.193c-.658-.143-1.253-.438-1.75-.848-1.42%203.82-2.415%209.728-1.37%2018.616.057.478.747.472.792-.007.386-4.122%201.382-10.788%203.927-16.005-.145-.224-.272-.463-.376-.718zM33.748%204.05l.288%202.87-2.176%201.867c-.128.11-.183.283-.142.448.04.164.17.29.334.327l2.79.61%201.084%202.67c.064.156.21.263.377.274l.03.002c.157%200%20.302-.084.38-.222l1.437-2.493%202.846-.218c.168-.013.313-.12.376-.278.062-.157.03-.337-.08-.463l-1.902-2.15.674-2.805c.04-.166-.017-.34-.145-.448-.082-.068-.183-.104-.284-.104-.06%200-.12.012-.178.038l-2.61%201.164-2.43-1.515c-.07-.044-.152-.066-.232-.066-.08%200-.162.02-.234.067-.142.09-.22.253-.204.422z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-events { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eevents%3C%2Ftitle%3E%3Cpath%20d%3D%22M52.964%2057.078h-.92V35.37v-.003c.577-.755.92-1.694.92-2.71v-1.81c0-.013%200-.026-.002-.04v-.03c-.005-.04-.01-.08-.018-.118%200-.003%200-.005-.002-.008-.008-.038-.02-.074-.033-.11l-.01-.02c-.014-.04-.03-.076-.05-.11l-.005-.008c-.02-.033-.04-.065-.063-.095-.005-.008-.01-.014-.016-.02-.025-.032-.052-.062-.08-.09l-.006-.005L30.863%209.66V8.235h6.446c.34%200%20.65-.184.81-.478.162-.294.144-.65-.044-.928l-1.5-2.212%201.5-2.212c.188-.277.206-.634.045-.928-.16-.294-.47-.478-.81-.478h-7.367c-.51%200-.92.405-.92.904V9.66L7.204%2030.194c-.002%200-.003.003-.005.005-.03.028-.056.058-.08.09-.007.006-.012.013-.017.02-.023.03-.044.06-.063.094l-.004.007c-.02.036-.037.073-.052.11l-.008.022c-.013.036-.024.072-.033.11%200%20.003%200%20.005-.002.007-.007.037-.012.077-.015.117%200%20.01%200%20.02-.002.03l-.002.04v1.81c0%201.016.344%201.955.922%202.71V57.08h-.92c-.51%200-.922.405-.922.905s.412.904.92.904H17.973c.03%200%20.057-.002.086-.004h.008l.042-.007c.018-.003.036-.005.054-.01.01%200%20.02-.004.03-.006.022-.005.044-.01.065-.018.002%200%20.005%200%20.008-.002l.023-.01c.02-.006.04-.013.058-.022l.018-.008c1.405-.64%202.722-1.536%203.94-2.667.085.026.177.04.272.04H37.31c.094%200%20.186-.013.272-.04%201.217%201.13%202.534%202.026%203.94%202.667.005.003.01.006.017.008.018.01.038.016.057.023l.023.01c.003%200%20.005%200%20.008.002.02.007.043.013.066.018l.03.008.053.008.042.007h.007c.03.003.057.004.086.004h11.051c.51%200%20.92-.405.92-.904%200-.5-.41-.905-.92-.905zm-44.2-24.42v-.906h5.524v.905c0%201.496-1.24%202.713-2.763%202.713s-2.762-1.217-2.762-2.713zm15.107-2.715l5.152-14.545V27.23c0%20.5.412.905.92.905.51%200%20.92-.405.92-.905V15.398l5.152%2014.545H23.87zm-1.95%200h-4.95l9.9-13.977-4.95%2013.977zm-5.79%201.81h5.525v.904c0%201.496-1.24%202.713-2.763%202.713s-2.762-1.217-2.762-2.713v-.905zm7.367%200h5.525v.904c0%201.496-1.24%202.713-2.763%202.713-1.524%200-2.763-1.217-2.763-2.713v-.905zm7.366%200h5.526v.904c0%201.496-1.24%202.713-2.764%202.713-1.523%200-2.763-1.217-2.763-2.713v-.905zm7.367%200h5.526v.904c0%201.496-1.24%202.713-2.763%202.713s-2.763-1.217-2.763-2.713v-.905zm7.367%200h5.525v.904c0%201.496-1.24%202.713-2.762%202.713-1.523%200-2.763-1.217-2.763-2.713v-.905zm-.44-1.81l-4.21-5.946c-.29-.41-.866-.51-1.283-.226-.417.286-.52.85-.23%201.26l3.48%204.913h-4.95l-4.95-13.977%203.86%205.45c.18.253.466.388.757.388.183%200%20.366-.052.526-.162.418-.285.52-.85.23-1.26l-2.416-3.41%2013.78%2012.97H45.16zM34.703%205.12l.887%201.307h-4.727V2.81h4.726L34.7%204.115c-.207.304-.207.7%200%201.004zM23.915%2016.97l-9.187%2012.973h-4.594l13.78-12.972zM20.64%2055.18c.8-1.912%201.46-4.303%201.965-7.156.705-3.975.892-7.65.892-9.036%200-.5-.413-.904-.92-.904-.51%200-.922.405-.922.904%200%202.543-.745%2013.52-4.137%2018.09H16.13v-18.09c0-.5-.413-.904-.92-.904-.51%200-.922.405-.922.904v18.09H9.684V36.8c.564.244%201.187.38%201.84.38%201.506%200%202.844-.713%203.685-1.813.84%201.1%202.178%201.812%203.682%201.812%201.505%200%202.843-.713%203.684-1.813.84%201.1%202.18%201.812%203.683%201.812.98%200%201.89-.304%202.637-.82-.255%202.326-.922%205.82-2.18%209.26-1.137%203.106-3.045%206.942-6.078%209.56zm9.303-14.034c.367%201.61.857%203.35%201.493%205.087%201.188%203.248%202.7%205.98%204.482%208.132h-11.95c1.78-2.153%203.293-4.884%204.48-8.132.637-1.737%201.127-3.476%201.495-5.087zm3.226%204.475c-1.26-3.44-1.927-6.934-2.182-9.26.748.516%201.657.82%202.638.82%201.505%200%202.843-.713%203.683-1.813.84%201.1%202.178%201.812%203.683%201.812%201.504%200%202.843-.713%203.683-1.813.84%201.1%202.18%201.812%203.684%201.812.654%200%201.277-.136%201.842-.38V57.08h-4.605v-18.09c0-.5-.412-.904-.92-.904-.51%200-.92.405-.92.904v18.09h-1.39c-3.392-4.57-4.137-15.547-4.137-18.09%200-.5-.412-.904-.92-.904-.51%200-.92.405-.92.904%200%201.388.185%205.06.89%209.036.506%202.853%201.164%205.244%201.967%207.156-3.034-2.618-4.942-6.454-6.078-9.56z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-facebook { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232.2%22%20viewBox%3D%220%200%2032%2032.2%22%3E%3Cstyle%3E.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M0%200v32.2h12.8V19.6h-2.4v-4.1h2.4v-3.3c0-.6-.1-4.7%205.3-4.7h3.8v4.1h-2.8c-.6%200-1.3.7-1.3%201.1v2.8h4c-.2%202.2-.5%204.1-.5%204.1h-3.6v12.6H32V0H0z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-fax { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2228%22%20height%3D%2228%22%20viewBox%3D%220%200%2028%2028%22%3E%3Cpath%20d%3D%22M4.5%206q1.03%200%201.766.734T7%208.5v17q0%201.03-.734%201.766T4.5%2028h-2q-1.03%200-1.766-.734T0%2025.5v-17q0-1.03.734-1.766T2.5%206h2zM26%208.547q.906.53%201.453%201.453T28%2012v12q0%201.656-1.172%202.828T24%2028H10.5q-1.03%200-1.766-.734T8%2025.5v-24q0-.625.438-1.062T9.5%200H20q.625%200%201.375.313t1.188.75l2.375%202.375q.438.438.75%201.188T26%206V8.55zM14.5%2024v-2q0-.22-.14-.36T14%2021.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T14%2017.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T14%2013.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm4%208v-2q0-.22-.14-.36T18%2021.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T18%2017.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T18%2013.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm4%208v-2q0-.22-.14-.36T22%2021.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T22%2017.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm0-4v-2q0-.22-.14-.36T22%2013.5h-2q-.22%200-.36.14t-.14.36v2q0%20.22.14.36t.36.14h2q.22%200%20.36-.14t.14-.36zm1.5-6V6h-2.5q-.625%200-1.062-.438T20%204.5V2H10v8h14z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-flower { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eflower%3C%2Ftitle%3E%3Cpath%20d%3D%22M46.562%2015.88c0-2.81-2.04-5.652-5.94-5.652-.192%200-.387.007-.584.02%201.486-2.203%201.29-4.116%201.033-5.072C40.423%202.756%2038.1%201%2035.55%201c-1.9%200-4.002%201.036-5.27%203.65C29.01%202.037%2026.907%201%2025.007%201c-2.55%200-4.87%201.756-5.52%204.176-.256.955-.453%202.87%201.032%205.072-2.53-.178-4.658.843-5.764%202.758-1.008%201.747-1.008%204.004%200%205.75%201.02%201.765%202.907%202.777%205.178%202.777h.002c.192%200%20.387-.007.584-.02-1.486%202.203-1.288%204.117-1.032%205.073.65%202.42%202.97%204.175%205.52%204.175.777%200%201.588-.177%202.362-.56v7.9h-9.9v6.666h1.834l2.103%209.014H17.47v4.645h25.62V53.78h-3.94l2.104-9.014h1.835V38.1h-9.9v-7.885c.728.357%201.525.546%202.36.546%202.55%200%204.872-1.756%205.52-4.175.256-.956.454-2.87-1.032-5.073.198.014.392.02.585.02%203.9%200%205.94-2.843%205.94-5.652zM30.28%2020.543c-2.576%200-4.663-2.088-4.663-4.663s2.087-4.662%204.662-4.662c2.574%200%204.662%202.087%204.662%204.662%200%202.575-2.088%204.663-4.663%204.663z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-food-hygiene { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Efood-hygiene%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M19.205%2021.77v33.183c0%20.865.316%201.614.95%202.246.625.62%201.363.933%202.213.943.85-.01%201.59-.323%202.213-.944.635-.633.952-1.382.952-2.247V21.77c.95-.333%204.52-3.5%204.52-4.517V3.906c0-.43-.16-.806-.477-1.122-.318-.316-.694-.474-1.127-.474-.434%200-.81.158-1.126.474-.318.317-.476.69-.476%201.122v10.378c0%20.433-.16.807-.476%201.123-.317.316-.692.473-1.126.473-.435%200-.81-.157-1.127-.473-.316-.316-.475-.69-.475-1.123V3.906c0-.43-.16-.806-.476-1.122-.317-.316-.693-.474-1.127-.474-.435%200-.81.158-1.127.474-.317.317-.476.69-.476%201.122v10.378c0%20.433-.16.807-.476%201.123-.316.316-.69.473-1.125.473-.434%200-.81-.157-1.127-.473-.317-.316-.475-.69-.475-1.123V3.906c0-.43-.16-.806-.476-1.122-.317-.316-.693-.474-1.127-.474-.434%200-.81.158-1.126.474-.317.317-.476.69-.476%201.122v13.346c0%201.016%204.225%204.184%205.177%204.517zM22.88%2058.18c-.095%200-.183-.038-.277-.038-.093%200-.178.037-.276.037h.552zM43.34%2058.834c-.094%200-.182-.037-.276-.037-.094%200-.183.037-.276.037h.552zM36.028%2029.74h3.637v25.868c0%20.865.317%201.614.95%202.245.625.622%201.363.935%202.214.945.848-.01%201.587-.323%202.21-.945.636-.63.953-1.38.953-2.245V2.598c0-.433-.16-.808-.476-1.124C45.2%201.158%2044.825%201%2044.39%201h-1.15c-2.204%200-4.09.782-5.66%202.345-1.567%201.564-2.352%203.443-2.352%205.638V28.94c0%20.217.08.404.238.562.158.158.345.237.562.237z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-forms { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Ctitle%3Eforms%3C%2Ftitle%3E%3Cpath%20d%3D%22M20.5%2028.6H2.4V4.4h18.1v4.1l2.4-2.7V4.5c0-1.4-1.1-2.5-2.5-2.5h-18C1.1%202%200%203.1%200%204.5v24.1C0%2029.9%201.1%2031%202.5%2031h18c1.4%200%202.5-1.1%202.5-2.5v-7.9l-2.4%202.7-.1%205.3zM18.4%208.9c0-.7-.5-1.2-1.2-1.2H5.6c-.6-.1-1.2.5-1.2%201.2s.5%201.2%201.2%201.2h11.6c.7%200%201.2-.6%201.2-1.2m-1.6%203.8H5.6c-.7%200-1.2.5-1.2%201.2s.5%201.2%201.2%201.2h9l2.2-2.4zm-4.5%205H5.6c-.7%200-1.2.5-1.2%201.2s.5%201.2%201.2%201.2h5.3l1.4-2.4zM4.4%2024c0%20.7.5%201.2%201.2%201.2h3.9c0-.2%200-.3.1-.4l.6-2H5.6c-.6%200-1.2.5-1.2%201.2m19.3-13.7l.3.2c.2.1.2.4%200%20.6l-.1.1-.4.4c-.1.1-.2.1-.3.1-.1%200-.2%200-.3-.1l-.3-.2c-.1-.1-.1-.2-.1-.3%200-.1%200-.2.1-.3l.5-.5c.2-.1.4-.2.6%200zm-1.6%202.9l-5.5%206.2c-.1.1-.2.1-.3.1-.1%200-.2%200-.3-.1l-.3-.2c-.2-.1-.2-.4%200-.5l5.5-6.2c.1-.1.2-.1.3-.1.1%200%20.2%200%20.3.1l.3.2c.1.1.1.4%200%20.5zm.4-4.2l-8.4%209.4-.7.7%204.6%204.2.7-.7%208.4-9.4.8-.8-4.6-4.2-.8.8zm1.6-1.8l-.3.4%204.6%204.2%201.1-1.3-4.6-4.2-.8.9zm5.7%201.1L27%205.8l.8-.9%202.8%202.5-.8.9zm2-1c0-.4-.2-.7-.4-.9L28.7%204c-.3-.2-.6-.4-1-.3-.4%200-.7.2-.9.4l-1.5%201.7%204.6%204.2%201.5-1.7c.3-.3.4-.6.4-1zM13.3%2021.2l2.7%202.4-2.1.9-1.2-1.1.6-2.2zm-1.8%204.7c.2.2.5.2.7.1l5.3-2.2-4.6-4.2-1.6%205.5c-.1.4%200%20.7.2.8z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-gym-membership { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Egym-membership%3C%2Ftitle%3E%3Cg%20fill%3D%22%23010002%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M1%2021.398h5.44v18.306H1zM46.054%2028.247H13.13v-8.66H7.686v21.932h5.442V31.403h32.924v9.388h5.44v-21.93h-5.44v9.385zM52.748%2020.675h5.444V38.98h-5.444z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2222%22%20viewBox%3D%220%200%2032%2022%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cg%20fill%3D%22%23ffffff%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M29.854%2021.333H2.82c-1.002%200-1.82-.84-1.82-1.865%200-1.026.818-1.865%201.82-1.865h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.865-1.82%201.865M29.854%2012.663H2.82c-1.002%200-1.82-.84-1.82-1.866%200-1.025.818-1.865%201.82-1.865h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.866-1.82%201.866M29.854%203.992H2.82C1.817%203.992%201%203.152%201%202.127%201%201.1%201.818.262%202.82.262h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.865-1.82%201.865%22%20fill%3D%22%23ffffff%22%3E%3C%2Fpath%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2222%22%20viewBox%3D%220%200%2032%2022%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M29.854%2021.333H2.82c-1.002%200-1.82-.84-1.82-1.865%200-1.026.818-1.865%201.82-1.865h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.865-1.82%201.865M29.854%2012.663H2.82c-1.002%200-1.82-.84-1.82-1.866%200-1.025.818-1.865%201.82-1.865h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.866-1.82%201.866M29.854%203.992H2.82C1.817%203.992%201%203.152%201%202.127%201%201.1%201.818.262%202.82.262h27.034c1%200%201.82.84%201.82%201.865%200%201.026-.82%201.865-1.82%201.865%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu2 { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%3Ctitle%3Ehamburger-menu2%3C%2Ftitle%3E%3Cdefs%3E%3Cpath%20id%3D%22a%22%20d%3D%22M0%20.168h18.964v13.485H0%22%2F%3E%3Cpath%20id%3D%22c%22%20d%3D%22M0%20.168h18.964v13.485H0%22%2F%3E%3Cpath%20id%3D%22e%22%20d%3D%22M0%20.168h18.964v13.485H0%22%2F%3E%3C%2Fdefs%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20fill%3D%22%23000%22%20d%3D%22M0%200h32v32H0z%22%2F%3E%3Cg%20transform%3D%22translate%287.04%205.76%29%22%3E%3Cmask%20id%3D%22b%22%20fill%3D%22%23fff%22%3E%3Cuse%20xlink%3Ahref%3D%22%23a%22%2F%3E%3C%2Fmask%3E%3Cpath%20d%3D%22M17.84%202.555H1.123C.506%202.555%200%202.018%200%201.36%200%20.706.506.17%201.124.17H17.84c.618%200%201.124.537%201.124%201.193%200%20.658-.506%201.195-1.125%201.195%22%20fill%3D%22%23FFF%22%20mask%3D%22url%28%23b%29%22%2F%3E%3C%2Fg%3E%3Cg%20transform%3D%22translate%287.04%205.76%29%22%3E%3Cmask%20id%3D%22d%22%20fill%3D%22%23fff%22%3E%3Cuse%20xlink%3Ahref%3D%22%23c%22%2F%3E%3C%2Fmask%3E%3Cpath%20d%3D%22M17.84%208.104H1.123C.506%208.104%200%207.567%200%206.91c0-.656.506-1.193%201.124-1.193H17.84c.618%200%201.124.537%201.124%201.193%200%20.657-.506%201.194-1.125%201.194%22%20fill%3D%22%23FFF%22%20mask%3D%22url%28%23d%29%22%2F%3E%3C%2Fg%3E%3Cg%20transform%3D%22translate%287.04%205.76%29%22%3E%3Cmask%20id%3D%22f%22%20fill%3D%22%23fff%22%3E%3Cuse%20xlink%3Ahref%3D%22%23e%22%2F%3E%3C%2Fmask%3E%3Cpath%20d%3D%22M17.84%2013.653H1.123C.506%2013.653%200%2013.116%200%2012.46c0-.657.506-1.194%201.124-1.194H17.84c.618%200%201.124.537%201.124%201.194%200%20.656-.506%201.193-1.125%201.193%22%20fill%3D%22%23FFF%22%20mask%3D%22url%28%23f%29%22%2F%3E%3C%2Fg%3E%3Ctext%20font-family%3D%22Montserrat%22%20font-size%3D%226.4%22%20font-weight%3D%22bold%22%20fill%3D%22%23FFF%22%3E%3Ctspan%20x%3D%226.4%22%20y%3D%2227.12%22%3EMENU%3C%2Ftspan%3E%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-harrogate-map { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%22106%22%20height%3D%2281%22%20viewBox%3D%220%200%20106%2081%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eharrogate-map%3C%2Ftitle%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M19.446%2070.243l-.59-.473v-1.653L17.09%2066.7v-1.77h1.708v-1.18l4.892-3.66V56.9l-1.533-2.124.118-2.36-1.886%201.06v-3.54l-2.123-1.54s-.235-1.294-.353-1.65c-.118-.353%201.65-2.006%201.65-2.006l.825-2.125.59-1.59-2.005-2.07-.943-3.66-2.947-.945-1.65-4.014-1.77%201.063-3.89-1.772-.588-1.89v-1.416l-1.533-3.07h-2.83L2%2019.828l6.955-5.313h2.83l5.068-4.486%204.95-2.01%201.887-1.77.542-1.89%207.12%201.418%203.3-2.48L41.137%202l.707%202.243%203.183.118%201.06%201.654-1.613.472%201.614%202.008s1.297-.473%201.297%200v1.89L45.97%2015.34l1.414%202.007%202.947-1.064s1.397-.482%201.533-.944c.136-.463-1.4-.567-.943-1.063.457-.497%202.358-.473%202.358-.473l3.065%202.36%204.48-1.062%201.65-1.416%201.178-2.835%201.062-.118%201.18%202.007%202.828-.944%201.18%202.48v1.888l1.177%201.535%204.598.944%202.004%202.126%203.182.944v1.3l1.885%202.36v9.091l-1.296.945%201.297%203.424%203.065.118%203.183%205.313v4.128h3.065l2.475.595.944-.594%201.413%202.247v2.244l2.004.354%202.947%202.126V56.9l-1.297-.47c0%20.47.59%201.534.59%201.888%200%20.354-1.65.59-1.65.59l-.944-.708-2.593%202.36%203.536%209.683-.825%201.77-1.296-.826H95.36l-1.416-2.952-3.18%201.063.47%202.716-.706%202.007-.118%203.66h-.943l-2.476-1.77-.47-4.487-1.886-2.48-2.358-2.242-3.3.237-3.89.826s-1.18%202.007-1.533%202.243c-.354.237-3.654%201.18-3.654%201.18l.588%202.717-2.004%201.416-2.947-.945-3.3-1.18c-.877-.12.59.826-1.415.944-2.004.117-4.362.59-4.362.59l-.117.944-2.476.354-1.945-2.243s-1.002.472-1.002.944c0%20.47-1.18%201.18-1.886.944-.707-.236-2.24-.355-2.71-.355-.473%200-3.89-.945-3.89-.945l-2.36-.236s-1.767-1.182-2.356-1.182c-.59%200-2.24.118-2.24.118l-.707%201.77-1.768-.825-.353-2.36s-2.595-.59-2.948-.59c-.354%200-1.533-.237-1.533-.237l-2.948-.827-1.768-.59-2.947.354-1.06.473z%22%20stroke%3D%22%23EAA221%22%20stroke-width%3D%222%22%2F%3E%3Cpath%20d%3D%22M53.39%2051.17c-1.817%200-3.29-1.474-3.29-3.294s1.473-3.295%203.29-3.295%203.29%201.477%203.29%203.296c0%201.82-1.473%203.295-3.29%203.295m0-11.532c-4.543%200-8.225%203.69-8.225%208.238%200%204.55%208.226%2017.024%208.226%2017.024s8.226-12.474%208.226-17.024c0-4.55-3.683-8.238-8.225-8.238%22%20fill%3D%22%23000%22%2F%3E%3Cpath%20d%3D%22M67.97%2051.614c-1.223%200-2.215-.976-2.215-2.18%200-1.204.992-2.182%202.216-2.182%201.225%200%202.217.978%202.217%202.18%200%201.206-.992%202.182-2.216%202.182m0-7.633c-3.06%200-5.538%202.443-5.538%205.453%200%203.013%205.54%2011.268%205.54%2011.268s5.54-8.254%205.54-11.267c0-3.01-2.482-5.452-5.54-5.452M61.497%2026.28c-1.225%200-2.216-.975-2.216-2.18%200-1.204.992-2.18%202.217-2.18%201.223%200%202.215.976%202.215%202.18%200%201.205-.992%202.18-2.215%202.18m0-7.632c-3.06%200-5.54%202.44-5.54%205.452s5.54%2011.268%205.54%2011.268%205.54-8.256%205.54-11.268c0-3.01-2.48-5.452-5.54-5.452M25.74%2030.842c-.794%200-1.438-.634-1.438-1.416%200-.78.644-1.416%201.44-1.416.793%200%201.438.635%201.438%201.416%200%20.782-.645%201.416-1.44%201.416m0-4.956c-1.986%200-3.596%201.585-3.596%203.54%200%201.956%203.597%207.317%203.597%207.317s3.598-5.36%203.598-7.317c0-1.955-1.61-3.54-3.597-3.54M32.935%2059.07c-.795%200-1.44-.633-1.44-1.415s.645-1.416%201.44-1.416c.795%200%201.44.633%201.44%201.415s-.645%201.416-1.44%201.416m0-4.956c-1.987%200-3.597%201.586-3.597%203.54%200%201.957%203.597%207.317%203.597%207.317s3.597-5.36%203.597-7.315-1.61-3.54-3.597-3.54M75.38%2035.91c-.794%200-1.438-.635-1.438-1.417s.644-1.416%201.44-1.416c.794%200%201.438.634%201.438%201.416%200%20.782-.644%201.416-1.44%201.416m0-4.958c-1.986%200-3.596%201.586-3.596%203.54%200%201.957%203.597%207.318%203.597%207.318s3.598-5.36%203.598-7.317c0-1.955-1.61-3.54-3.597-3.54%22%20fill%3D%22%231F6C54%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-health-and-safety { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ehealth-and-safety%3C%2Ftitle%3E%3Cpath%20d%3D%22M21.417%2058.022l11.87-20.29-1.714-1.627c-2.012%201.628-4.45%202.573-7.09%202.573-2.472%200-4.813-.847-6.725-2.312l-2.44%202.312h-4.78c-2.21%200-3.925.75-5.277%202.28-3.922%204.46-3.263%2014.1-2.966%2017.064h19.123zm-6.858-31.23c.33%202.702%201.45%205.08%203.132%206.838.362.358.725.717%201.12%201.01.495.39%201.023.716%201.583%201.01%201.253.65%202.638%201.01%204.122%201.01s2.868-.36%204.12-1.01c.562-.294%201.09-.62%201.584-1.01.396-.326.76-.652%201.122-1.01%201.65-1.758%202.803-4.136%203.1-6.806h.098c1.748%200%203.133-1.596%203.133-3.55%200-1.204-.528-2.246-1.32-2.898h-23.21c-.793.652-1.32%201.694-1.32%202.9.033%201.79%201.187%203.255%202.736%203.516zm5.077-21.754c-3.43%201.726-6.133%205.178-7.155%208.532l-.23.717h-1.88v4.07h27.762v-4.07h-1.846l-.23-.717c-1.023-3.354-3.727-6.773-7.156-8.5v8.858c-.033.36-.1.684-.264%201.01-.428.814-1.286%201.4-2.275%201.4H22.21c-.924%200-1.75-.488-2.177-1.205-.198-.293-.297-.618-.363-.977-.033-.13-.033-.228-.033-.358v-8.76zm2.572%2010.226h4.12c.594%200%201.088-.326%201.352-.815.132-.23.198-.457.198-.717V3.02c0-.26-.066-.49-.132-.717C27.45%201.553%2026.693%201%2025.836%201H22.21c-.793%200-1.452.586-1.518%201.335%200%20.065-.033.13-.033.196V13.734c0%20.326.098.62.263.88.297.39.758.65%201.286.65zM39.617%2049.88h4.154l.792-6.382.23-1.824.132-.977H38.464l1.154%209.183zm-.43%201.042h5.145v5.08H39.19v-5.08zm2.31-21.916c-.363%200-.726.195-.924.52L36.42%2036.66l-.594%201.008-.593%201.01-10.98%2018.79c-.1.163-.132.358-.132.52%200%20.164.034.36.133.49.198.325.528.52.923.52h32.708c.595%200%201.056-.455%201.056-1.042%200-.26-.1-.455-.232-.65L42.42%2029.525c-.198-.325-.527-.52-.923-.52zm6.857%2028.006H26.99L37.705%2038.71l.594-1.01.592-1.01%202.67-4.525%2014.542%2024.847h-7.75z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-health-safety { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2232px%22%20height%3D%2232px%22%20viewBox%3D%220%200%2032%2032%22%20style%3D%22enable-background%3Anew%200%200%2032%2032%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%20.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Ctitle%3Ehealth-safety%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M20.8%2C20.8c0%2C0.6-0.5%2C1.2-1.2%2C1.2h-2.3v2.3c0%2C0.6-0.5%2C1.2-1.2%2C1.2h-0.9c-0.6%2C0-1.2-0.5-1.2-1.2V22h-2.3%20c-0.6%2C0-1.2-0.5-1.2-1.2v-0.9c0-0.6%2C0.5-1.2%2C1.2-1.2H14v-2.2c0-0.6%2C0.5-1.2%2C1.2-1.2h0.9c0.6%2C0%2C1.2%2C0.5%2C1.2%2C1.2v2.2h2.3%20c0.6%2C0%2C1.2%2C0.5%2C1.2%2C1.2L20.8%2C20.8L20.8%2C20.8z%20M31.4%2C26.8V12.8H0v14.1C0%2C27.5%2C0.5%2C28%2C1.2%2C28h29C30.9%2C28%2C31.4%2C27.5%2C31.4%2C26.8%20L31.4%2C26.8z%20M21.5%2C7.8H9.9V5.9h11.6L21.5%2C7.8L21.5%2C7.8L21.5%2C7.8z%20M31.4%2C8.9c0-0.6-0.5-1.2-1.2-1.2h-6.3v-3c0-0.6-0.5-1.2-1.2-1.2%20h-14C8%2C3.6%2C7.5%2C4.1%2C7.5%2C4.8v3H1.2C0.5%2C7.8%2C0%2C8.3%2C0%2C8.9v2.5h31.4V8.9z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-homes-property { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cpath%20fill%3D%22%23FFF%22%20d%3D%22M.5%2015.6h30.7c.2%200%20.4-.1.5-.3.1-.2%200-.4-.2-.5l-4-2.5V7.6c0-.3-.2-.5-.5-.5h-4.2c-.3%200-.5.2-.5.5V9l-6-3.7c-.2-.1-.4-.1-.6%200L.2%2014.8c-.2.1-.2.3-.2.5.1.2.3.3.5.3m24.9%207.1c0%20.3-.2.5-.5.5h-8.5c-.3%200-.5-.2-.5-.5v-3.8c0-.3.2-.5.5-.5h8.5c.3%200%20.5.2.5.5v3.8zm-11.9%204.2H6.6V26c0-.1.1-.2.3-.2h6.4c.1%200%20.3.1.3.2l-.1.9zm-6.1-8c0-.3.2-.5.5-.5h4.2c.3%200%20.5.2.5.5v5.7c0%20.3-.2.5-.5.5H7.9c-.3%200-.5-.2-.5-.5v-5.7zm23.8%208h-2.6V17c0-.3-.2-.5-.5-.5H3.7c-.3%200-.5.2-.5.5v9.9H.5c-.3%200-.5.2-.5.5s.2.5.5.5h30.7c.3%200%20.5-.2.5-.5s-.2-.5-.5-.5z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-hydro-swimming-pool { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2218%22%20viewBox%3D%220%200%2032%2018%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Ehydro-swimming-pool%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M13.55%207.197l-6.466%204.638c.28-.058.59-.093.932-.093%201.55%200%202.407.69%202.976%201.144.416.334.557.447.99.447.435%200%20.576-.113.992-.447.568-.455%201.427-1.144%202.976-1.144%201.55%200%202.408.69%202.977%201.144.416.334.557.447.99.447.435%200%20.575-.113.992-.447.186-.15.41-.33.68-.5L17.07%204.74%2010.894.12%203.838%202.127%202.95%206.203l7.338-1.444%203.26%202.435.002.002z%22%2F%3E%3Cpath%20d%3D%22M28.764%2014.142c-.416.333-.556.446-.99.446-.436%200-.576-.113-.992-.446-.57-.456-1.428-1.145-2.977-1.145-1.55%200-2.408.69-2.977%201.145-.416.333-.556.446-.99.446-.435%200-.575-.113-.992-.446-.568-.456-1.427-1.145-2.976-1.145-1.55%200-2.408.69-2.976%201.145-.417.333-.557.446-.992.446-.434%200-.574-.113-.99-.446-.57-.456-1.427-1.145-2.977-1.145-1.55%200-2.408.69-2.977%201.145-.416.333-.556.446-.99.446-.435%200-.575-.113-.992-.446-.568-.456-1.427-1.145-2.976-1.145v3.182c.434%200%20.575.11.99.443.57.455%201.428%201.144%202.977%201.144%201.55%200%202.41-.69%202.977-1.145.417-.334.557-.446.99-.446.436%200%20.576.11.992.445.568.456%201.427%201.145%202.977%201.145%201.55%200%202.408-.69%202.976-1.145.413-.333.553-.445.99-.445.432%200%20.572.11.99.445.57.455%201.426%201.144%202.976%201.144s2.407-.69%202.976-1.145c.416-.336.557-.448.99-.448.436%200%20.576.11.992.445.57.455%201.428%201.144%202.977%201.144%201.55%200%202.41-.69%202.978-1.144.415-.334.555-.446.99-.446v-3.18c-1.55%200-2.408.69-2.977%201.145M29.833%206.232c0%202.856-2.312%205.17-5.163%205.17-2.85%200-5.163-2.314-5.163-5.17%200-2.855%202.312-5.17%205.163-5.17%202.85%200%205.163%202.315%205.163%205.17%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-icon-bank { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eicon-bank%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M30%201C13.983%201%201%2013.983%201%2030s12.983%2029%2029%2029%2029-12.983%2029-29S46.017%201%2030%201zm0%2053.47C16.486%2054.47%205.53%2043.513%205.53%2030S16.487%205.53%2030%205.53%2054.47%2016.487%2054.47%2030%2043.513%2054.47%2030%2054.47z%22%2F%3E%3Cpath%20d%3D%22M39.608%2044.5H20.392v-2.942c2.588-1.225%204.912-3.858%204.912-7.013%200-.793%200-1.494-.175-2.33h-4.345V28.49h3.732c-.177-1.187-.397-2.635-.397-4.083%200-5.397%203.816-8.907%209.26-8.907%202.323%200%204.038.528%204.957%201.052l-.967%204.08c-.835-.438-2.06-.832-3.772-.832-3.29%200-4.43%202.194-4.43%204.782%200%201.45.174%202.678.482%203.907h6.138v3.726H30.13c.044%201.317.044%202.634-.303%203.907-.44%201.492-1.317%202.76-2.55%203.858v.088h12.33V44.5z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-information { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Einformation%3C%2Ftitle%3E%3Cpath%20d%3D%22M18.954%2010.437c-.452.414-.992.625-1.625.625-.626%200-1.172-.21-1.624-.625-.446-.416-.676-.924-.676-1.52%200-.59.23-1.097.676-1.52.452-.414.998-.625%201.623-.625.632%200%201.172.21%201.624.625.446.423.67.93.67%201.52%200%20.596-.224%201.104-.67%201.52zm.167%2013.812c-.774.302-1.388.532-1.846.692-.46.162-.992.243-1.6.243-.936%200-1.667-.23-2.182-.69-.52-.45-.775-1.033-.775-1.735%200-.273.02-.55.056-.836.038-.286.1-.602.185-.962l.97-3.415c.084-.33.16-.638.214-.924.057-.298.088-.563.088-.806%200-.434-.092-.738-.273-.91-.18-.174-.52-.255-1.03-.255-.246%200-.507.036-.768.11-.262.082-.484.156-.67.225l.254-1.048c.632-.26%201.24-.478%201.816-.664.578-.187%201.122-.28%201.638-.28.928%200%201.642.23%202.144.677.5.446.757%201.028.757%201.747%200%20.15-.02.41-.052.78-.036.38-.098.72-.192%201.03l-.96%203.403c-.08.273-.15.59-.218.937-.06.347-.092.614-.092.793%200%20.453.105.764.304.924.204.168.552.248%201.053.248.235%200%20.497-.043.794-.124.292-.08.508-.153.644-.215l-.26%201.054zM15.997%201C7.716%201%201%207.715%201%2015.996%201%2024.28%207.715%2031%2015.996%2031%2024.28%2031%2031%2024.28%2031%2015.996%2031%207.716%2024.28%201%2015.996%201z%22%20fill%3D%22%23221F20%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-jobs { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%3Ctitle%3Ejobs%3C%2Ftitle%3E%3Cdefs%3E%3Cpath%20id%3D%22a%22%20d%3D%22M0%20.347h31.934V31.93H0%22%2F%3E%3C%2Fdefs%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M14.018%208.4c-2.346%200-4.245%201.87-4.245%204.198%200%202.33%201.9%204.2%204.245%204.2s4.245-1.87%204.245-4.2c0-2.327-1.9-4.197-4.245-4.197%22%20fill%3D%22%23FFF%22%2F%3E%3Cmask%20id%3D%22b%22%20fill%3D%22%23fff%22%3E%3Cuse%20xlink%3Ahref%3D%22%23a%22%2F%3E%3C%2Fmask%3E%3Cpath%20d%3D%22M19.872%2021.26l-.41-1.207c-.32-.945-2.588-2.29-5.45-2.29-2.86%200-5.13%201.345-5.45%202.29l-.57%201.68c-2.52-1.755-4.172-4.648-4.172-7.92%200-5.342%204.395-9.688%209.795-9.688s9.795%204.346%209.795%209.688c0%202.99-1.38%205.668-3.538%207.446m11.503%207.444l-6.88-6.803c1.77-2.325%202.736-5.172%202.736-8.087C27.23%206.388%2021.124.347%2013.616.347%206.11.347%200%206.387%200%2013.813%200%2021.24%206.11%2027.28%2013.615%2027.28c2.947%200%205.827-.958%208.178-2.708l6.88%206.803c.36.357.84.554%201.352.554.512%200%20.99-.198%201.35-.554.36-.357.56-.83.56-1.336%200-.506-.2-.98-.56-1.336%22%20fill%3D%22%23FFF%22%20mask%3D%22url%28%23b%29%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-leisure-sport { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23282828%3B%7D%3C%2Fstyle%3E%3Ctitle%3Eleisure-sport%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M8.4%2010.7l3%202.1-1.1%203.3H6.6l-1.1-3.3%202.9-2.1zm5.8%207l-.1-1-2.6.5-1.5%202.3%201%20.4c-.8.3-1.6.4-2.5.4-.9%200-1.7-.2-2.5-.4l1-.4-1.4-2.2-2.6-.5-.2%201c-1-1.2-1.5-2.7-1.5-4.3v-.2l.7.7%201.8-2-.4-2.7-1%20.2c1-1.4%202.4-2.4%204.1-2.8l-.5.8%202.5%201%202.5-1-.5-.9c1.7.5%203.1%201.5%204.1%202.8l-1-.2-.3%202.6%201.8%202%20.7-.7v.2c-.1%201.7-.7%203.2-1.6%204.4zM8.4%205.2C3.8%205.2%200%208.9%200%2013.4c0%204.5%203.8%208.2%208.4%208.2%204.6%200%208.4-3.7%208.4-8.2.1-4.5-3.7-8.2-8.4-8.2zm12.7%209.1c-.8-.7-1.6-.9-2.1-.9.1-.5.4-1.1.8-1.5.4-.4.9-.7%201.4-.7.1.5.3%201.3%201.1%202%20.8.8%201.6%201%202.1%201-.1.5-.3%201.1-.8%201.5-.4.4-1%20.7-1.5.7%200-.5-.2-1.3-1-2.1m-1.4%201.3c-.5-.5-.8-1.1-.8-1.8.5%200%201.1.1%201.8.8.6.7.8%201.3.8%201.7-.6.1-1.2-.1-1.8-.7m2.9-2.8c-.7-.7-.8-1.3-.8-1.7.7%200%201.3.3%201.9.8.5.5.8%201.1.8%201.7-.5%200-1.2-.2-1.9-.8m-1.5%208.8c0-.2.1-.3.1-.5l.2.2c.1.1.2.2.3.2-.2%200-.4%200-.6.1m9.7-9.4c-.8-.7-1.9-1.1-3-1.1-1%200-1.9.3-2.9.7.3.4.4.8.5%201.3.7-.5%201.5-.7%202.3-.7.6%200%201.4.1%202.1.7%201.4%201.3.8%204.1-1.2%206-1.2%201.2-2.8%201.9-4.2%201.9-.6%200-1.4-.1-2.1-.7-.7-.7-.9-1.8-.7-2.9h-.1c-.4%200-.9-.1-1.2-.2-.1.7-.2%201.3%200%202%200%201-.1%202.5-.7%203.2l-.7.7c-.2-.2-.6-.2-.8%200l-2.5%202.5c-.1.2-.1.7.3%201.1.4.4%201%20.5%201.1.3l2.5-2.5c.2-.2.2-.5%200-.7l.8-.7c.6-.6%202.1-.8%203.1-.8.3.1.6.1%201%20.1%201.7%200%203.6-.8%205.2-2.3%202.6-2.5%203.1-6%201.2-7.9%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-licences-permissions { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2232px%22%20height%3D%2232px%22%20viewBox%3D%220%200%2032%2032%22%20style%3D%22enable-background%3Anew%200%200%2032%2032%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%20.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Ctitle%3Elicences-permissions%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M15.8%2C7.1H6.1c-0.3%2C0-0.6%2C0.2-0.6%2C0.6c0%2C0.3%2C0.3%2C0.6%2C0.6%2C0.6h9.8c0.3%2C0%2C0.6-0.2%2C0.6-0.6S16.2%2C7.1%2C15.8%2C7.1%20%20M15.3%2C25.7c-0.3%2C0-0.5-0.2-0.5-0.5c0-0.3%2C0.2-0.5%2C0.5-0.5s0.5%2C0.2%2C0.5%2C0.5C15.8%2C25.5%2C15.6%2C25.7%2C15.3%2C25.7L15.3%2C25.7z%20M13.7%2C25.7%20H9.5v-1h4.2L13.7%2C25.7L13.7%2C25.7z%20M7.9%2C25.7c-0.3%2C0-0.5-0.2-0.5-0.5c0-0.3%2C0.2-0.5%2C0.5-0.5c0.3%2C0%2C0.5%2C0.2%2C0.5%2C0.5%20C8.4%2C25.5%2C8.2%2C25.7%2C7.9%2C25.7L7.9%2C25.7z%20M20%2C26.8l-2.5-3.1H3.2V4.1H20v13.7c0.4%2C0.1%2C0.8%2C0.4%2C1.1%2C0.7l2%2C2.2V3.1c0-1.1-0.9-2.1-2.1-2.1%20h-19C0.9%2C1.1%2C0%2C2%2C0%2C3.1v22.6c0%2C1.1%2C0.9%2C2.1%2C2.1%2C2.1H20c0-0.2%2C0-0.3%2C0-0.5C20%2C27.3%2C20%2C26.8%2C20%2C26.8z%20M31.6%2C31.2l-2-3.2l-1.2-1.9v-6%20c0-0.3%2C0-0.6%2C0-0.9c-0.1-2.1-0.9-4.7-3.3-6.7v0c-0.2-0.1-0.4-0.2-0.6-0.1c-0.2%2C0.1-0.3%2C0.3-0.3%2C0.5v10.5l-1.1-1.1l-2.8-3%20c-0.1-0.1-0.2-0.2-0.4-0.2v0c-0.3-0.2-0.7-0.3-1.1-0.3c-0.6%2C0-1.1%2C0.2-1.4%2C0.5c-0.6%2C0.6-0.7%2C1.7-0.3%2C2.5c0%2C0%2C0.1%2C0.1%2C0.1%2C0.1%20c0%2C0.1%2C0.1%2C0.1%2C0.1%2C0.2l1.4%2C1.7h0l2.1%2C2.6c0.1%2C0.1%2C0.1%2C0.2%2C0.1%2C0.3v0.7c0%2C0.2%2C0%2C0.3%2C0.1%2C0.5h0l0%2C0c0.1%2C0.3%2C0.2%2C0.7%2C0.4%2C1.1l0%2C0%20c0.1%2C0.2%2C0.2%2C0.4%2C0.3%2C0.5c0%2C0%2C0.1%2C0.1%2C0.1%2C0.1c0.1%2C0.1%2C0.1%2C0.2%2C0.2%2C0.4c0.1%2C0.1%2C0.1%2C0.2%2C0.2%2C0.3l0.1%2C0.1c0.2%2C0.4%2C0.5%2C0.7%2C0.7%2C0.9%20c0.1%2C0.1%2C0.2%2C0.3%2C0.3%2C0.4c0.1%2C0.1%2C0.3%2C0.2%2C0.4%2C0.2h7.4c0.3%2C0%2C0.5-0.2%2C0.5-0.5C31.6%2C31.3%2C31.6%2C31.2%2C31.6%2C31.2%20M17.1%2C10h-11%20c-0.3%2C0-0.6%2C0.3-0.6%2C0.6c0%2C0.3%2C0.3%2C0.6%2C0.6%2C0.6h11c0.3%2C0%2C0.6-0.2%2C0.6-0.6C17.7%2C10.2%2C17.4%2C10%2C17.1%2C10%20M17.1%2C12.6h-11%20c-0.3%2C0-0.6%2C0.3-0.6%2C0.6s0.3%2C0.6%2C0.6%2C0.6h11c0.3%2C0%2C0.6-0.2%2C0.6-0.6S17.4%2C12.6%2C17.1%2C12.6%20M11.8%2C15.3H6.1c-0.3%2C0-0.6%2C0.2-0.6%2C0.6%20c0%2C0.3%2C0.3%2C0.6%2C0.6%2C0.6h5.7c0.3%2C0%2C0.6-0.2%2C0.6-0.6C12.4%2C15.6%2C12.1%2C15.3%2C11.8%2C15.3%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-licensing-and-permissions { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Elicensing-and-permissions%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M41.25%2041.188c-.495%200-.896.398-.896.89s.4.89.896.89c.988%200%201.792.8%201.792%201.782%200%20.492.4.89.895.89s.896-.398.896-.89c0-1.964-1.607-3.563-3.583-3.563z%22%2F%3E%3Cpath%20d%3D%22M49.313%202H11.687C10.207%202%209%203.2%209%204.672v48.094c0%201.473%201.206%202.672%202.688%202.672h19.717c.012.086.036.172.073.254.123.263.367.45.654.503l2.325.418%202.053%202.115c.17.175.403.272.644.272.037%200%20.074-.002.11-.007.28-.035.528-.198.668-.442l1.79-3.112h3.036l1.772%203.11c.14.245.386.41.667.445.037.005.075.007.112.007.24%200%20.474-.097.644-.272l2.053-2.115%202.325-.418c.286-.052.53-.24.653-.502.12-.26.11-.563-.033-.813.654-.503%201.048-1.285%201.048-2.114V4.672C52%203.2%2050.794%202%2049.313%202zm-38.52%2050.766V4.672c0-.49.4-.89.895-.89h37.624c.494%200%20.896.4.896.89v48.094c0%20.19-.064.374-.176.525l-2.735-4.723c.707-1.104%201.12-2.413%201.12-3.817%200-3.93-3.215-7.125-7.167-7.125s-7.167%203.196-7.167%207.125c0%201.403.412%202.71%201.12%203.815l-2.976%205.09h-20.54c-.493%200-.895-.398-.895-.89zm30.457-2.672c-2.964%200-5.375-2.397-5.375-5.344%200-2.947%202.41-5.344%205.375-5.344%202.964%200%205.375%202.397%205.375%205.344%200%202.947-2.41%205.344-5.375%205.344zm-4.28%206.542l-1.425-1.467c-.13-.136-.3-.226-.485-.26l-1.352-.242%202.72-4.653c.93.844%202.085%201.448%203.364%201.71l-2.823%204.91zm3.776-2.98l.5-.87.497.87h-.997zm6.658%201.255c-.185.034-.355.124-.485.26l-1.422%201.463-2.795-4.906c1.28-.262%202.435-.865%203.367-1.71l2.692%204.65-1.358.244z%22%2F%3E%3Cpath%20d%3D%22M37.667%2015.36c.494%200%20.895-.4.895-.89%200-.493-.4-.892-.895-.892H23.333c-.494%200-.895.4-.895.89%200%20.493.4.89.895.89h14.334zM42.146%2018.03H18.854c-.495%200-.896.4-.896.892s.4.89.896.89h23.292c.495%200%20.896-.398.896-.89s-.4-.89-.896-.89zM21.542%2026.938h.895c.495%200%20.896-.4.896-.89%200-.493-.4-.892-.895-.892h-.896c-.495%200-.896.4-.896.89%200%20.493.4.892.896.892zM21.542%2031.39h.895c.495%200%20.896-.398.896-.89s-.4-.89-.895-.89h-.896c-.495%200-.896.398-.896.89s.4.89.896.89zM21.542%2035.844h.895c.495%200%20.896-.4.896-.89%200-.493-.4-.892-.895-.892h-.896c-.495%200-.896.4-.896.89%200%20.493.4.892.896.892zM39.458%2025.156H26.02c-.494%200-.895.4-.895.89%200%20.493.4.892.896.892H39.46c.495%200%20.896-.4.896-.89%200-.493-.4-.892-.896-.892zM39.458%2029.61H26.02c-.494%200-.895.398-.895.89s.4.89.896.89H39.46c.495%200%20.896-.398.896-.89s-.4-.89-.896-.89zM39.458%2034.063H26.02c-.494%200-.895.398-.895.89s.4.89.896.89H39.46c.495%200%20.896-.398.896-.89s-.4-.89-.896-.89zM17.958%2043.86c0%20.49.4.89.896.89h8.063c.494%200%20.895-.4.895-.89%200-.492-.4-.89-.895-.89h-8.063c-.495%200-.896.398-.896.89z%22%2F%3E%3Cpath%20d%3D%22M30.5%2050.094H17.868c-.357-1.742-1.74-3.118-3.493-3.473V10.818c1.752-.355%203.136-1.73%203.493-3.473h25.264c.357%201.742%201.74%203.118%203.493%203.473v26.808c0%20.492.4.89.896.89.495%200%20.897-.398.897-.89v-27.61c0-.49-.402-.89-.896-.89-1.48%200-2.687-1.2-2.687-2.672%200-.492-.4-.89-.896-.89H17.063c-.495%200-.896.398-.896.89%200%201.473-1.206%202.672-2.688%202.672-.496%200-.897.4-.897.89v37.407c0%20.492.4.89.896.89%201.48%200%202.687%201.2%202.687%202.672%200%20.492.4.89.895.89H30.5c.495%200%20.896-.398.896-.89%200-.49-.4-.89-.896-.89z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-link { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cpath%20d%3D%22M6.88%209.934c-.21%200-.417-.08-.576-.238-1.486-1.486-1.486-3.905%200-5.392l3-3C10.024.584%2010.982.187%2012%20.187s1.976.397%202.696%201.117c1.486%201.487%201.486%203.905%200%205.392l-1.37%201.37c-.318.318-.833.318-1.15%200s-.317-.83%200-1.148l1.37-1.37c.854-.854.854-2.242%200-3.095-.412-.413-.962-.64-1.546-.64s-1.134.227-1.547.64l-3%203c-.853.853-.853%202.24%200%203.094.317.317.317.832%200%201.15-.16.158-.367.237-.575.237z%22%2F%3E%3Cpath%20d%3D%22M4%2015.813c-1.018%200-1.976-.397-2.696-1.117-1.486-1.486-1.486-3.905%200-5.392l1.37-1.37c.318-.318.833-.318%201.15%200s.317.83%200%201.148l-1.37%201.37c-.854.854-.854%202.242%200%203.095.412.413.96.64%201.546.64s1.134-.227%201.547-.64l3-3c.853-.853.853-2.24%200-3.094-.317-.317-.317-.832%200-1.15s.832-.316%201.15%200c1.485%201.487%201.485%203.906%200%205.393l-3%203c-.72.72-1.68%201.117-2.697%201.117z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-magnifying-glass-white { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2229%22%20height%3D%2230%22%20viewBox%3D%220%200%2029%2030%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%20fill%3D%22%23ffffff%22%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M4.233%2011.974c0-4.634%203.7-8.404%208.245-8.404%204.546%200%208.245%203.77%208.245%208.404%200%204.633-3.7%208.403-8.245%208.403-4.546%200-8.245-3.77-8.245-8.403m23.49%2013.46L21.55%2019.14c1.506-1.982%202.406-4.467%202.406-7.166%200-6.46-5.14-11.7-11.478-11.7C6.138.275%201%205.515%201%2011.975c0%206.46%205.14%2011.7%2011.478%2011.7%201.808%200%203.518-.428%205.04-1.188v.003l6.55%206.67c.503.517%201.166.773%201.828.773.66%200%201.324-.256%201.828-.773%201.01-1.028%201.01-2.697%200-3.726%22%20fill%3D%22%23ffffff%22%20fill-rule%3D%22evenodd%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-magnifying-glass { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2229%22%20height%3D%2230%22%20viewBox%3D%220%200%2029%2030%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3ESlice%201%3C%2Ftitle%3E%3Cpath%20d%3D%22M4.233%2011.974c0-4.634%203.7-8.404%208.245-8.404%204.546%200%208.245%203.77%208.245%208.404%200%204.633-3.7%208.403-8.245%208.403-4.546%200-8.245-3.77-8.245-8.403m23.49%2013.46L21.55%2019.14c1.506-1.982%202.406-4.467%202.406-7.166%200-6.46-5.14-11.7-11.478-11.7C6.138.275%201%205.515%201%2011.975c0%206.46%205.14%2011.7%2011.478%2011.7%201.808%200%203.518-.428%205.04-1.188v.003l6.55%206.67c.503.517%201.166.773%201.828.773.66%200%201.324-.256%201.828-.773%201.01-1.028%201.01-2.697%200-3.726%22%20fill%3D%22%230072B3%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.site-content address:before,
-.icon-map-pointer { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Emap-pointer%3C%2Ftitle%3E%3Cpath%20d%3D%22M16%2014.462c-2.21%200-4-1.782-4-3.98%200-2.2%201.79-3.983%204-3.983s4%201.783%204%203.98c0%202.2-1.79%203.982-4%203.982M16%20.526c-5.524%200-10%204.458-10%209.955%200%205.5%2010%2020.573%2010%2020.573S26%2015.98%2026%2010.48C26%204.985%2021.522.527%2016%20.527%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-map { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%22103%22%20height%3D%2279%22%20viewBox%3D%220%200%20103%2079%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Emap%3C%2Ftitle%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M19.446%2070.243l-.59-.473v-1.653L17.09%2066.7v-1.77h1.708v-1.18l4.892-3.66V56.9l-1.533-2.124.118-2.36-1.886%201.06v-3.54l-2.123-1.54s-.235-1.294-.353-1.65c-.118-.353%201.65-2.006%201.65-2.006l.825-2.125.59-1.59-2.005-2.07-.943-3.66-2.947-.945-1.65-4.014-1.77%201.063-3.89-1.772-.588-1.89v-1.416l-1.533-3.07h-2.83L2%2019.828l6.955-5.313h2.83l5.068-4.486%204.95-2.01%201.887-1.77.542-1.89%207.12%201.418%203.3-2.48L41.137%202l.707%202.243%203.183.118%201.06%201.654-1.613.472%201.614%202.008s1.297-.473%201.297%200v1.89L45.97%2015.34l1.414%202.007%202.947-1.064s1.397-.482%201.533-.944c.136-.463-1.4-.567-.943-1.063.457-.497%202.358-.473%202.358-.473l3.065%202.36%204.48-1.062%201.65-1.416%201.178-2.835%201.062-.118%201.18%202.007%202.828-.944%201.18%202.48v1.888l1.177%201.535%204.598.944%202.004%202.126%203.182.944v1.3l1.885%202.36v9.091l-1.296.945%201.297%203.424%203.065.118%203.183%205.313v4.128h3.065l2.475.595.944-.594%201.413%202.247v2.244l2.004.354%202.947%202.126V56.9l-1.297-.47c0%20.47.59%201.534.59%201.888%200%20.354-1.65.59-1.65.59l-.944-.708-2.593%202.36%203.536%209.683-.825%201.77-1.296-.826H95.36l-1.416-2.952-3.18%201.063.47%202.716-.706%202.007-.118%203.66h-.943l-2.476-1.77-.47-4.487-1.886-2.48-2.358-2.242-3.3.237-3.89.826s-1.18%202.007-1.533%202.243c-.354.237-3.654%201.18-3.654%201.18l.588%202.717-2.004%201.416-2.947-.945-3.3-1.18c-.877-.12.59.826-1.415.944-2.004.117-4.362.59-4.362.59l-.117.944-2.476.354-1.945-2.243s-1.002.472-1.002.944c0%20.47-1.18%201.18-1.886.944-.707-.236-2.24-.355-2.71-.355-.473%200-3.89-.945-3.89-.945l-2.36-.236s-1.767-1.182-2.356-1.182c-.59%200-2.24.118-2.24.118l-.707%201.77-1.768-.825-.353-2.36s-2.595-.59-2.948-.59c-.354%200-1.533-.237-1.533-.237l-2.948-.827-1.768-.59-2.947.354-1.06.473z%22%20stroke%3D%22%23EAA221%22%20stroke-width%3D%222%22%2F%3E%3Cpath%20d%3D%22M53.39%2051.17c-1.817%200-3.29-1.474-3.29-3.294s1.473-3.295%203.29-3.295%203.29%201.477%203.29%203.296c0%201.82-1.473%203.295-3.29%203.295m0-11.532c-4.543%200-8.225%203.69-8.225%208.238%200%204.55%208.226%2017.024%208.226%2017.024s8.226-12.474%208.226-17.024c0-4.55-3.683-8.238-8.225-8.238%22%20fill%3D%22%23000%22%2F%3E%3Cpath%20d%3D%22M67.97%2051.614c-1.223%200-2.215-.976-2.215-2.18%200-1.204.992-2.182%202.216-2.182%201.225%200%202.217.978%202.217%202.18%200%201.206-.992%202.182-2.216%202.182m0-7.633c-3.06%200-5.538%202.443-5.538%205.453%200%203.013%205.54%2011.268%205.54%2011.268s5.54-8.254%205.54-11.267c0-3.01-2.482-5.452-5.54-5.452M61.497%2026.28c-1.225%200-2.216-.975-2.216-2.18%200-1.204.992-2.18%202.217-2.18%201.223%200%202.215.976%202.215%202.18%200%201.205-.992%202.18-2.215%202.18m0-7.632c-3.06%200-5.54%202.44-5.54%205.452s5.54%2011.268%205.54%2011.268%205.54-8.256%205.54-11.268c0-3.01-2.48-5.452-5.54-5.452M25.74%2030.842c-.794%200-1.438-.634-1.438-1.416%200-.78.644-1.416%201.44-1.416.793%200%201.438.635%201.438%201.416%200%20.782-.645%201.416-1.44%201.416m0-4.956c-1.986%200-3.596%201.585-3.596%203.54%200%201.956%203.597%207.317%203.597%207.317s3.598-5.36%203.598-7.317c0-1.955-1.61-3.54-3.597-3.54M32.935%2059.07c-.795%200-1.44-.633-1.44-1.415s.645-1.416%201.44-1.416c.795%200%201.44.633%201.44%201.415s-.645%201.416-1.44%201.416m0-4.956c-1.987%200-3.597%201.586-3.597%203.54%200%201.957%203.597%207.317%203.597%207.317s3.597-5.36%203.597-7.315-1.61-3.54-3.597-3.54M75.38%2035.91c-.794%200-1.438-.635-1.438-1.417s.644-1.416%201.44-1.416c.794%200%201.438.634%201.438%201.416%200%20.782-.644%201.416-1.44%201.416m0-4.958c-1.986%200-3.596%201.586-3.596%203.54%200%201.957%203.597%207.318%203.597%207.318s3.598-5.36%203.598-7.317c0-1.955-1.61-3.54-3.597-3.54%22%20fill%3D%22%239E9E9E%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-menu-up { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2255.7%22%20height%3D%2227.8%22%20viewBox%3D%220%200%2055.7%2027.8%22%3E%3Cpath%20d%3D%22M55.7%2027.8L27.8%200%200%2027.8%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-minus-btn { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%230072B3%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M.1%2012.7h31.8v7.6H.1v-7.6z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-missed-bin-collection { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Emissed-bin-collection%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M22.97%2011.457l-1.72%202.188.143.273c.032.073.062.114.07.127.008.01.018.013.027.022.213.315.65.76.987.76h2.902c.113%200%20.206-.095.206-.21v-2.95c0-.115-.093-.21-.207-.21h-2.41z%22%2F%3E%3Cpath%20d%3D%22M23.095%2010.624h.95c.077%200%20.148-.042.182-.114.037-.068.033-.15-.01-.214L22.65%207.958c-.04-.056-.104-.09-.173-.09h-2.874c-.084%200-.16.05-.192.134-.03.08-.01.172.053.23l.612.58c-.18.19-.417.537-.417%201.07%200%20.548.686%202.015%201.38%203.357l1.602-2.04c.134-.183.28-.372.455-.576M31.733%209.37l-1.666-2.447c-.064-.095-.194-.12-.287-.054L27.514%208.46c-.047.033-.077.083-.086.14-.01.056.003.112.037.16.463.635%201.11%201.528%201.543%202.133h2.52l.155-.285c.033-.05.06-.097.083-.15l.03-.058V10.4v-.006c.055-.16.143-.72-.063-1.024%22%2F%3E%3Cpath%20d%3D%22M28.91%2011.33c-.232%200-.48-.014-.74-.043v-.875c0-.092-.06-.173-.146-.202-.087-.026-.182.01-.232.086l-1.568%202.39c-.043.066-.047.15-.008.22l1.47%202.654c.038.07.107.11.18.11.016%200%20.03-.003.046-.006.088-.02.153-.097.162-.19l.073-.94c.115.04.258.074.415.074.246%200%20.477-.077.69-.225.43-.303%201.283-1.71%202.04-3.067h-2.018c-.115.008-.235.014-.363.014M21.478%206.686l2.49%201.194c.028.014.06.02.09.02.023%200%20.047-.004.07-.012.05-.02.094-.058.116-.11.008-.014.502-1.092.888-1.92l-1.674-2.72c-.28.038-.7.295-.83.577l-1.25%202.69c-.048.106-.003.23.1.28%22%2F%3E%3Cpath%20d%3D%22M28.67%206.712l1.306-2.517c.04-.077.03-.17-.028-.24-.057-.064-.146-.087-.228-.056l-.835.313c-.08-.25-.274-.61-.746-.837-.137-.064-.55-.263-3.217-.263-.312%200-.648.003-.986.007l1.623%202.64h-.004c.095.16.188.322.274.497l-.314.17c-.084.045-.127.142-.105.237.025.094.107.16.202.16h2.873c.078%200%20.148-.043.184-.112M17.044%2027.285c0-.876-.702-1.59-1.565-1.59-.864%200-1.567.714-1.567%201.59%200%20.878.703%201.594%201.566%201.594.862%200%201.564-.717%201.564-1.595m1.105%200c0%201.498-1.2%202.715-2.67%202.715-1.474%200-2.672-1.217-2.672-2.715%200-1.495%201.198-2.713%202.67-2.713%201.473%200%202.67%201.218%202.67%202.713m-1.292-19.03v-1.51c0-.156-.123-.28-.276-.28H13.1v-.686c0-.157-.124-.282-.277-.282H6.345c-.152%200-.275.125-.275.28v.686H1.276c-.153%200-.276.125-.276.28v1.512c0%20.158.123.282.276.282H16.58c.153%200%20.276-.124.276-.282M11.84%2027.238c0%20.81.27%201.554.72%202.152H6.683c-1.474%200-3.546-2.688-3.546-4.07v-8.776c0-1.334-1.474-3.63-1.474-3.63V9.36H16.01l.017%2014.39c-.223-.044-.452-.068-.687-.068-1.932%200-3.5%201.59-3.5%203.556%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-museums-galleries { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2232px%22%20height%3D%2232px%22%20viewBox%3D%220%200%2032%2032%22%20style%3D%22enable-background%3Anew%200%200%2032%2032%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%20.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M2.2%2C25.1v2.1c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5h26.6c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-2.1c0-0.3-0.2-0.5-0.5-0.5H2.7%20C2.4%2C24.6%2C2.2%2C24.8%2C2.2%2C25.1%20M31.5%2C28.8H0.6c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v2.1c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5h30.9c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-2.1%20C32%2C29%2C31.8%2C28.8%2C31.5%2C28.8%20M7%2C23.5c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-9.6c0-0.3-0.2-0.5-0.5-0.5H4.9c-0.3%2C0-0.5%2C0.2-0.5%2C0.5V23%20c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5H7z%20M13.4%2C23.5c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-9.6c0-0.3-0.2-0.5-0.5-0.5h-2.1c-0.3%2C0-0.5%2C0.2-0.5%2C0.5V23%20c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5H13.4z%20M20.8%2C23.5c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-9.6c0-0.3-0.2-0.5-0.5-0.5h-2.1c-0.3%2C0-0.5%2C0.2-0.5%2C0.5V23%20c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5C18.7%2C23.5%2C20.8%2C23.5%2C20.8%2C23.5z%20M27.2%2C23.5c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-9.6c0-0.3-0.2-0.5-0.5-0.5h-2.1%20c-0.3%2C0-0.5%2C0.2-0.5%2C0.5V23c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5H27.2L27.2%2C23.5z%20M1.7%2C11.8h28.7c0.3%2C0%2C0.5-0.2%2C0.5-0.5V8.1c0-0.3-0.2-0.5-0.5-0.5%20H1.7c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v3.2C1.1%2C11.5%2C1.4%2C11.8%2C1.7%2C11.8%20M1.7%2C6.5h28.7c0.3%2C0%2C0.5-0.2%2C0.5-0.5c0-0.2-0.2-0.5-0.4-0.5L16.2%2C0.1%20c-0.1%2C0-0.2%2C0-0.4%2C0L1.5%2C5.4C1.2%2C5.5%2C1.1%2C5.8%2C1.1%2C6C1.2%2C6.3%2C1.4%2C6.5%2C1.7%2C6.5%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-parking-travel { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2232px%22%20height%3D%2232px%22%20viewBox%3D%220%200%2032%2032%22%20style%3D%22enable-background%3Anew%200%200%2032%2032%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%20.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Ctitle%3Eparking-travel%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M5.1%2C5.8c0.1%2C0%2C0.3-0.1%2C0.7-0.1c0.8%2C0%2C1.3%2C0.4%2C1.3%2C1c0%2C0.7-0.5%2C1.2-1.4%2C1.2c-0.2%2C0-0.4%2C0-0.6%2C0L5.1%2C5.8L5.1%2C5.8%20z%20M5.1%2C9.1c0.2%2C0%2C0.3%2C0%2C0.6%2C0c1%2C0%2C1.8-0.2%2C2.4-0.7c0.4-0.4%2C0.7-1%2C0.7-1.7S8.3%2C5.4%2C7.9%2C5.1C7.4%2C4.7%2C6.7%2C4.5%2C5.7%2C4.5%20c-1%2C0-1.7%2C0.1-2.2%2C0.1v7h1.6L5.1%2C9.1L5.1%2C9.1z%20M1.6%2C4.2c0-0.3%2C0.2-0.5%2C0.5-0.5H10c0.3%2C0%2C0.5%2C0.2%2C0.5%2C0.5v7.7c0%2C0.3-0.2%2C0.5-0.5%2C0.5%20H2.1c-0.3%2C0-0.5-0.2-0.5-0.5L1.6%2C4.2L1.6%2C4.2z%20M2%2C13.9h8.1c1%2C0%2C1.9-0.8%2C1.9-1.8V4.1c0-1-0.8-1.8-1.9-1.8H2c-1%2C0-1.8%2C0.8-1.8%2C1.8V12%20C0.2%2C13%2C1%2C13.8%2C2%2C13.9L2%2C13.9z%20M7.7%2C27.4c-0.5%2C0-1-0.4-1-1s0.4-1%2C1-1c0.5%2C0%2C1%2C0.4%2C1%2C1C8.6%2C27%2C8.2%2C27.4%2C7.7%2C27.4%20M7.7%2C23.3%20c-1.8%2C0-3.2%2C1.4-3.2%2C3.2c0%2C1.7%2C1.4%2C3.2%2C3.2%2C3.2s3.2-1.4%2C3.2-3.2C10.9%2C24.7%2C9.4%2C23.3%2C7.7%2C23.3%20M22%2C18.6v-2.2h0.7%20c0.2%2C0%2C0.4%2C0.1%2C0.6%2C0.2l2.1%2C1.8C25.4%2C18.5%2C22%2C18.6%2C22%2C18.6z%20M20.3%2C18.7l-10.2%2C0.5l1.9-1.5c1.1-0.8%2C2.4-1.3%2C3.7-1.3h4.5L20.3%2C18.7%20L20.3%2C18.7z%20M31.1%2C23.9l-0.5-4.2c-0.1-0.8-0.8-1.4-1.7-1.4l-1.2%2C0.1l-3.6-3.2c-0.3-0.3-0.8-0.5-1.3-0.5h-7.3c-1.6%2C0-3.2%2C0.6-4.5%2C1.6%20l-4.1%2C3.2l-5.5%2C1.3c-0.7%2C0.2-1.2%2C0.8-1.2%2C1.5v1.5c-0.2%2C0-0.4%2C0.2-0.4%2C0.4v2c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5h3.1c0-0.1%2C0-0.3%2C0-0.4%20c0-2.2%2C1.8-4%2C4.1-4c2.2%2C0%2C4.1%2C1.8%2C4.1%2C4c0%2C0.1%2C0%2C0.3%2C0%2C0.4h8.6c0-0.1%2C0-0.3%2C0-0.4c0-2.2%2C1.8-4%2C4.1-4c2.2%2C0%2C4.1%2C1.8%2C4.1%2C4%20c0%2C0.1%2C0%2C0.3%2C0%2C0.4h2.9c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-1.9C31.7%2C24.1%2C31.4%2C23.9%2C31.1%2C23.9L31.1%2C23.9z%20M24.2%2C27.4c-0.5%2C0-1-0.4-1-1%20s0.4-1%2C1-1c0.5%2C0%2C1%2C0.4%2C1%2C1C25.2%2C27%2C24.8%2C27.4%2C24.2%2C27.4%20M24.2%2C23.3c-1.8%2C0-3.2%2C1.4-3.2%2C3.2c0%2C1.7%2C1.4%2C3.2%2C3.2%2C3.2%20c1.8%2C0%2C3.2-1.4%2C3.2-3.2C27.5%2C24.7%2C26%2C23.3%2C24.2%2C23.3%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-parking { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eparking%3C%2Ftitle%3E%3Cpath%20d%3D%22M36.502%2022.635c0%202.745-2.233%204.98-4.98%204.98h-8.025v-9.96h8.026c2.746%200%204.98%202.234%204.98%204.98zM59%208.81v42.38c0%204.306-3.504%207.81-7.81%207.81H8.81C4.505%2059%201%2055.496%201%2051.19V8.81C1%204.505%204.504%201%208.81%201h42.38C55.495%201%2059%204.504%2059%208.81zM44.257%2022.636c0-7.022-5.713-12.734-12.734-12.734H17.286c-.852%200-1.543.692-1.543%201.544v37.112c0%20.852.69%201.543%201.543%201.543h4.67c.85%200%201.542-.692%201.542-1.544V35.368h8.025c7.02%200%2012.734-5.712%2012.734-12.733z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-parks-openspaces { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23282828%3B%7D%3C%2Fstyle%3E%3Ctitle%3Eparks-openspaces%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M3%2026.6c.3%200%20.6-.1.8-.2v1.7h.5v-1.8c.3.2.6.3%201%20.3.8%200%201.5-.6%201.6-1.3.3%200%20.6-.2.8-.4v-.7c-.4.1-.8.2-1.2.2-1.2%200-2.2-.5-3-1.3-1.6-.7-2.7-2.2-2.7-3.9-.3.3-.5.6-.5%201-.1.4.1.8.2%201.1-.3.2-.5.7-.5%201.2%200%20.6.3%201.1.8%201.4-.1.2-.1.4-.1.6%200%20.7.5%201.3%201.1%201.6.3.3.7.5%201.2.5M18.2%2022c0-.6-.3-1.2-.9-1.5-.5.4-1%20.7-1.6.8-.6%201.8-2.2%203-4.1%203-.3%200-.6%200-1-.1v.2c0%20.7.5%201.3%201.1%201.6.3.3.7.5%201.2.5.3%200%20.6-.1.8-.2V28h.5v-1.8c.3.2.6.3%201%20.3.8%200%201.5-.6%201.6-1.3.8-.1%201.4-.8%201.4-1.7%200-.3-.1-.7-.3-.9.2-.1.3-.3.3-.6m-8.7.7c.6.5%201.4.7%202.2.7%201.8%200%203.2-1.2%203.6-2.9%201.8-.3%203.1-1.8%203.1-3.6%200-.8-.2-1.5-.6-2.1.2-.5.3-1%20.3-1.5%200-1.6-1-2.9-2.4-3.5.3-.5.5-1.1.5-1.8%200-2-1.6-3.7-3.7-3.7-.7%200-1.4.2-2%20.6-.6-1.1-1.8-1.8-3.2-1.8-1.7%200-3.2%201.2-3.6%202.8-1.5.3-2.8%201.6-3%203.2-.1.9.1%201.7.5%202.4-.7.7-1.2%201.7-1.2%202.8%200%201.3.7%202.5%201.7%203.1-.2.4-.2.9-.2%201.3%200%201.6%201%202.9%202.4%203.5.7.7%201.6%201.2%202.7%201.2.6%200%201.2-.2%201.8-.5v5.4h-7v.7h29.1v-.7h-21v-5.6zm17%20.2c0-.2.1-.3.2-.5.1-.3.3-.7.5-1%20.2-.3.5-.6.8-.9.1-.1.1-.2.1-.3-.1-.1-.2-.2-.3-.1-.4.2-.7.5-1.1.8-.3.3-.6.6-.9%201-.1.2-.2.4-.4.6%200-.4%200-.9.1-1.4.1-.5.2-1%20.2-1.5s0-1.1-.1-1.6c0-.1-.1-.1-.2-.1s-.2.1-.2.2c.1.5%200%201-.1%201.4-.1.5-.3.9-.5%201.4s-.3%201-.3%201.6v.2c-.2-.3-.4-.6-.7-.9-.4-.4-.9-.6-1.4-.7-.1%200-.1%200-.2.1s0%20.2%200%20.2c.4.3.8.6%201%20.9l.3.6c-2.4-.5-3.6-2.3-3.6-3.5%200-.9.5-1.8%201.2-2.3.3.6.7%201.1%201.3%201.6.5.4.9%200%20.6-.3-.6-.6-.7-1.5-.7-2.3%200-1.6%201.3-3%202.9-3%201.6%200%202.9%201.3%202.9%203%200%20.3.2.6.5.7h.1c1%20.5%201.7%201.5%201.7%202.6%200%201.3-1.4%203-3.7%203.5m5.2-3.5c0-1.6-.9-3-2.2-3.8-.2-2.2-2.1-4-4.4-4-2.2%200-4.1%201.7-4.4%203.9-1.5.7-2.5%202.2-2.5%203.9%200%202.3%202%204.6%205.3%205.1%200%20.7-.1%201.2-.1%201.6h-.1c0%20.3%200%20.6-.2%201%200%20.1-.1.1-.1.2s0%200-.1%200h3.8s-.1-.2-.2-.5v-.2c-.1-.4-.2-.5-.2-1.3%200%200%200%20.1%200%200v-.2-.8c3.2-.4%205.4-2.7%205.4-4.9%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-payments { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Ctitle%3Epayments%3C%2Ftitle%3E%3Cpath%20d%3D%22M1%201.3v15.3c0-.6.4-1.1%201-1.6V2.3h27.7v16.8H16.8v1h13.8V1.3H1zm14.8%2012.4c-1.9%200-3.5-1.6-3.5-3.5s1.6-3.5%203.5-3.5%203.5%201.6%203.5%203.5-1.6%203.5-3.5%203.5zM7.4%209.2c-.8%200-1.5-.7-1.5-1.5s.7-1.5%201.5-1.5%201.5.7%201.5%201.5-.7%201.5-1.5%201.5zm16.8%203c.8%200%201.5.7%201.5%201.5s-.7%201.5-1.5%201.5-1.5-.7-1.5-1.5.7-1.5%201.5-1.5zm-7.4%205h8.9c1.1%200%202-.9%202-2V6.3c0-1.1-.9-2-2-2H5.9c-1.1%200-2%20.9-2%202v8c1.9-.5%204.2-.5%204.9-.5%201.3%200%207.9.1%207.9%203l.1.4zM2%2027.6V29c0%20.1%200%20.2.1.3%200%20.1.1.1.1.2v.1l.2.2c.1%200%20.4.2.6.3.1%200%20.2.1.3.1h.1c.1%200%20.2.1.3.1.1%200%20.2%200%20.2.1h.2c1.4.4%203.1.6%204.4.6h1c1.2%200%202.9-.2%204.3-.5h.2c.1%200%20.2%200%20.2-.1.1%200%20.2-.1.3-.1h.1c.1%200%20.2-.1.3-.1.2-.1.5-.2.6-.4l.2-.2v-.1c0-.1.1-.1.1-.2s.1-.2.1-.3v-1.5c-1.8.8-5.4%201-6.9%201-1.6%200-5.3-.2-7-.9m13.8-11c-.2-1.3-4.1-1.9-6.9-1.9-1.6%200-3.5.2-4.9.6-.1%200-.1%200-.2.1-.1%200-.2.1-.3.1h-.1c-.1%200-.2.1-.3.1-.2.1-.5.2-.6.4l-.2.2v.1c0%20.1-.1.1-.1.2v.2c.5.4%203.1%201.1%206.9%201.1%203.6-.1%206.2-.8%206.7-1.2M2%2017.7V19c.4.4%203.1%201.1%206.9%201.1%203.8%200%206.5-.7%206.9-1.1v-1.4c-1.8.8-5.4%201-6.9%201s-5.2-.2-6.9-.9m0%207.4v1.4c.4.4%203.1%201.1%206.9%201.1%203.8%200%206.5-.7%206.9-1.1v-1.4c-1.8.8-5.4%201-6.9%201s-5.2-.2-6.9-1m0-2.5V24c.4.4%203.1%201.1%206.9%201.1%203.8%200%206.5-.7%206.9-1.1v-1.4c-1.8.8-5.4%201-6.9%201s-5.2-.2-6.9-1m0-2.5v1.4c.4.4%203.1%201.1%206.9%201.1%203.8%200%206.5-.7%206.9-1.1v-1.4c-1.8.8-5.4%201-6.9%201s-5.2-.2-6.9-1%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-pest-control { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Epest-control%3C%2Ftitle%3E%3Cpath%20d%3D%22M48.122%2018.89c-.235-.008-2.322-.034-3.42%201.19-.994%201.105-3.303%202.87-4.433%203.2-.63-2.037-1.088-3.435-1.233-3.814-.342-.896-.86-1.443-1.537-1.626-.152-.04-.303-.06-.45-.06-.03-.164-.064-.326-.102-.487.964-.086%202.077-.483%202.813-1.414.523-.66.97-1.582%201.4-2.475.277-.57.684-1.41.914-1.67l4.39-.863-.356-1.744-4.524.89c-.87.17-1.342%201.146-2.057%202.624-.372.77-.794%201.64-1.194%202.146-.52.655-1.507.77-1.978.74-.427-.96-.997-1.814-1.672-2.52%201.245-1.05%201.936-2.876%201.547-4.324-.155-.576-.695-1.805-2.494-2.148.075-.065.168-.127.287-.185.547-.268%202.022-.937%203.685-1.545%201.815-.662%203.254-1.027%204.053-1.027%201.25%200%203.08%202.125%203.77%203.154.273.41.834.525%201.252.256.417-.27.534-.82.26-1.23C46.772%205.55%2044.325%202%2041.762%202c-1.04%200-2.615.383-4.684%201.14-1.508.55-3.06%201.225-3.864%201.62-.882.434-1.29%201.074-1.422%201.684H28.21c-.15-.708-.65-1.303-1.425-1.683-.804-.395-2.357-1.07-3.864-1.62C20.85%202.382%2019.276%202%2018.238%202c-2.563%200-5.01%203.552-5.28%203.957-.274.41-.157.96.26%201.23.417.27.978.155%201.253-.254.69-1.03%202.518-3.155%203.767-3.155.8%200%202.24.365%204.054%201.027%201.664.608%203.138%201.277%203.686%201.546.117.058.21.12.284.184-1.806.34-2.347%201.573-2.502%202.15-.39%201.45.304%203.28%201.552%204.33-.67.703-1.238%201.553-1.665%202.51-.415.054-1.435-.05-1.98-.736-.4-.506-.82-1.377-1.193-2.146-.715-1.478-1.188-2.454-2.057-2.625l-4.524-.89-.354%201.745%204.39.862c.23.26.636%201.1.912%201.67.43.894.878%201.816%201.4%202.475.747.943%201.862%201.338%202.812%201.416-.038.16-.072.32-.102.484-.132.005-.266.023-.4.06-.68.183-1.197.73-1.54%201.626-.144.38-.604%201.782-1.234%203.825-1.113-.293-3.47-2.09-4.477-3.21-1.098-1.224-3.186-1.198-3.42-1.19-.5.014-.89.422-.876.912.014.49.43.88.93.864.375-.01%201.553.08%202.01.59.67.745%203.32%203.152%205.317%203.73-1.046%203.468-2.382%208.124-3.54%2012.744-1.266%205.046-2.115%209.208-2.523%2012.37-.56%204.357-.304%206.727.835%207.686.935.788%201.743%201.02%202.37%201.02.255%200%20.48-.04.673-.094%201.372-.396%201.9-1.81%202.03-2.234.092-.3.495-2.575%201.05-5.827%201.72%205.465%201.716%205.787%201.705%206.972l-.002.378c0%20.49.405.89.905.89s.906-.4.906-.89c0-.13%200-.25.002-.362.015-1.618.017-1.867-2.758-10.57-.027-.085-.066-.163-.114-.233.37-2.198.77-4.602%201.17-7.02.26%203.687.974%207.082%202.075%209.78%201.512%203.7%203.628%205.738%205.96%205.738%202.326%200%204.442-2.053%205.958-5.78%201.12-2.757%201.84-6.215%202.087-9.952.41%202.473.82%204.934%201.196%207.184-.065.082-.118.177-.152.284-2.775%208.703-2.773%208.952-2.758%2010.57%200%20.112.003.23.003.362%200%20.49.405.89.904.89.5%200%20.905-.4.905-.89%200-.136%200-.26-.002-.378-.01-1.192-.014-1.51%201.738-7.07.562%203.306.972%205.624%201.064%205.926.13.424.66%201.838%202.03%202.234.193.055.418.094.675.094.626%200%201.434-.232%202.37-1.02%201.285-1.082%202.254-4.34-1.687-20.056-1.16-4.626-2.498-9.288-3.545-12.758%201.992-.6%204.608-2.976%205.273-3.717.457-.51%201.635-.597%202.01-.59.5.02.915-.37.93-.86.016-.49-.377-.9-.876-.916zm-24.87%2013.13c.427-2.6.81-4.935%201.097-6.696%201.15%201.762%202.83%202.976%204.745%203.27v.986c-2.7.146-4.652.963-5.844%202.44zm6.747-5.13c-1.956%200-3.672-1.362-4.628-3.4%201.386.476%202.985.732%204.627.732.603%200%201.207-.034%201.793-.102.497-.057.852-.498.794-.986-.06-.487-.508-.836-1.004-.78-.517.06-1.05.09-1.584.09-1.87%200-3.655-.368-5.026-1.038-.088-.043-.18-.07-.273-.084-.083-.497-.13-1.014-.13-1.544%200-3.92%202.436-7.11%205.43-7.11%202.067%200%203.868%201.52%204.785%203.756.015.066.038.132.07.196.005.01.01.016.016.025.357.946.558%202.01.558%203.133%200%20.53-.046%201.047-.13%201.544-.093.014-.185.04-.273.084-.24.117-.496.226-.762.325-.467.175-.703.688-.526%201.147.138.356.48.575.847.575l.063-.003c-.952%202.06-2.68%203.44-4.648%203.44zM25.507%209.137c.163-.608.757-.916%201.766-.916h5.44c1.008%200%201.603.308%201.766.916.232.862-.37%202.167-1.226%202.704-.98-.608-2.084-.953-3.255-.953-1.173%200-2.28.345-3.26.956-.86-.535-1.465-1.845-1.232-2.708zm-8.137%2046.83c-.134.44-.435.93-.806%201.038-.327.094-.81-.108-1.357-.57-.15-.127-.873-1.02-.217-6.112.4-3.095%201.234-7.19%202.483-12.17%202.23-8.893%204.95-17.332%205.23-18.064.02-.054.042-.103.062-.147.01.772.103%201.52.266%202.232-2.138%2013.113-5.39%2032.818-5.66%2033.792zM30%2053.555c-1.01%200-2.035-.744-2.962-2.102.656.148%201.343.248%202.044.294l.06.002c.473%200%20.87-.36.903-.83.033-.49-.345-.914-.843-.946-1.223-.08-2.385-.344-3.365-.764-.04-.09-.078-.184-.116-.277-.326-.802-.617-1.672-.87-2.597%201.47.643%203.26.997%205.146.997.326%200%20.655-.01.977-.032.5-.032.876-.455.843-.945-.034-.49-.466-.86-.964-.828-.282.02-.57.028-.856.028-2.238%200-4.356-.584-5.682-1.564-.148-.787-.27-1.602-.37-2.44%201.638.86%203.777%201.34%206.055%201.34.603%200%201.207-.035%201.793-.103.497-.057.852-.5.794-.986-.06-.487-.507-.836-1.004-.78-.517.06-1.05.09-1.584.09-2.36%200-4.595-.598-5.977-1.602-.085-.062-.177-.106-.273-.135-.055-.886-.084-1.79-.084-2.706%200-.204.007-.4.02-.59%201.667.945%203.913%201.48%206.313%201.48.603%200%201.207-.036%201.794-.103.496-.057.85-.5.793-.986-.058-.488-.508-.837-1.004-.78-.517.06-1.05.09-1.584.09-2.336%200-4.546-.588-5.93-1.572.772-1.968%202.684-2.873%205.93-2.873%203.252%200%205.165.908%205.935%202.886-.04.017-.077.038-.114.063-.442.3-.966.56-1.557.782-.467.174-.702.687-.525%201.146.137.356.48.575.846.575.107%200%20.215-.02.32-.058.51-.19.98-.408%201.41-.65.012.19.02.386.02.59%200%20.962-.033%201.895-.092%202.798-.146.014-.29.064-.42.15-.444.3-.968.563-1.56.783-.466.174-.7.687-.524%201.146.137.356.48.574.846.574.106%200%20.215-.018.32-.058.407-.15.79-.32%201.147-.508-.1.856-.23%201.676-.38%202.457-.033.017-.067.037-.1.06-.576.403-1.315.75-2.137%201-.477.144-.744.642-.596%201.11.12.383.478.627.864.627.09%200%20.18-.013.27-.04.407-.124.794-.267%201.16-.426-.294%201.065-.63%202.03-1%202.884-.707.3-1.496.516-2.35.644-.493.075-.832.528-.757%201.014.07.44.454.754.894.754.045%200%20.09-.003.138-.01.295-.045.584-.1.867-.162-.925%201.348-1.942%202.092-2.923%202.092zm.904-23.976v-.985c1.935-.298%203.633-1.536%204.784-3.33.29%201.785.682%204.17%201.12%206.83-1.186-1.525-3.158-2.367-5.904-2.515zm14.152%2020.744c.657%205.09-.065%205.985-.217%206.112-.55.462-1.03.664-1.357.57-.37-.107-.673-.6-.806-1.033-.27-.983-3.543-20.806-5.68-33.92.15-.704.234-1.444.24-2.206.033.066.07.146.106.243.28.732%203%209.17%205.23%2018.065%201.25%204.98%202.084%209.074%202.483%2012.17z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-phone { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cpath%20d%3D%22M11%2010c-1%201-1%202-2%202s-2-1-3-2-2-2-2-3%201-1%202-2-2-4-3-4-3%203-3%203c0%202%202.055%206.055%204%208s6%204%208%204c0%200%203-2%203-3s-3-4-4-3z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-pin { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%228%22%20height%3D%2212%22%20viewBox%3D%220%200%208%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Epin%3C%2Ftitle%3E%3Cpath%20d%3D%22M4.38%205.91c-.794%200-1.438-.635-1.438-1.417s.644-1.416%201.44-1.416c.794%200%201.438.634%201.438%201.416%200%20.782-.644%201.416-1.44%201.416m0-4.958C2.395.952.785%202.538.785%204.492c0%201.957%203.597%207.318%203.597%207.318S7.98%206.45%207.98%204.493c0-1.955-1.61-3.54-3.597-3.54%22%20fill%3D%22%239E9E9E%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-planning-and-development { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eplanning-and-development%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M44.862%2033.32L30.57%2023.336c-.482-.336-1.112-.52-1.774-.52-.662%200-1.292.184-1.773.52l-5.075%203.545v-1.116c0-.656-.53-1.19-1.18-1.19h-2.986c-.65%200-1.18.534-1.18%201.19v4.362c0%20.154.03.3.085.43L12.73%2033.32c-.805.562-.847%201.088-.74%201.43.105.343.437.75%201.416.75h.714c.578%200%201.048.476%201.048%201.058v13.91c0%201.312%201.057%202.38%202.357%202.38h22.542c1.3%200%202.358-1.068%202.358-2.38V36.56c0-.582.47-1.057%201.048-1.057h.714c.978%200%201.31-.407%201.416-.75.106-.342.064-.868-.74-1.43zm-20.006%207.9c0%20.29-.235.528-.523.528h-5.936c-.29%200-.524-.238-.524-.53v-4.88c0-.29.235-.527.524-.527h5.936c.288%200%20.523.24.523.53v4.88zm7.052%208.5c0%20.292-.236.53-.524.53h-5.176c-.288%200-.524-.238-.524-.53v-5.318c0-.29.236-.528.524-.528h5.176c.288%200%20.524.238.524.528v5.32zm7.812-8.5c0%20.29-.236.528-.524.528H33.26c-.288%200-.524-.238-.524-.53v-4.88c0-.29.236-.527.524-.527h5.936c.288%200%20.524.24.524.53v4.88z%22%2F%3E%3Cpath%20d%3D%22M53.648%201H17.333c-.96%200-2.224.485-2.942%201.128l-9.053%208.115c-.746.67-1.31%201.933-1.31%202.94v43.473c0%201.275%201.03%202.312%202.294%202.312H53.65c1.263%200%202.292-1.037%202.292-2.312V3.312C55.94%202.037%2054.912%201%2053.648%201zM6.642%2011.725l9.054-8.116c.253-.228.722-.446%201.145-.555v9c0%20.178-.15.33-.326.33H6.2c.122-.268.28-.516.442-.66zm47.333%2044.93c0%20.18-.15.33-.327.33H6.32c-.177%200-.327-.15-.327-.33v-42.29h10.52c1.265%200%202.293-1.036%202.293-2.31V2.98h34.842c.177%200%20.327.15.327.33v53.344z%22%2F%3E%3Cpath%20d%3D%22M12.685%2020.192v-.228h30.2v.228c0%20.548.44.99.98.99.544%200%20.984-.442.984-.99v-2.39c0-.546-.44-.99-.984-.99-.542%200-.982.444-.982.99v.18h-30.2v-.18c0-.546-.44-.99-.98-.99-.544%200-.983.444-.983.99v2.39c0%20.548.44.99.983.99.542%200%20.982-.442.982-.99zM50.704%2023.953c.543%200%20.982-.443.982-.99%200-.548-.44-.99-.982-.99h-.977c-.067-.016-.136-.024-.207-.024-.072%200-.14.007-.208.022h-.977c-.542%200-.982.443-.982.99%200%20.548.44.99.982.99h.202V51.65h-.202c-.542%200-.982.444-.982.99%200%20.55.44.992.982.992h2.37c.542%200%20.98-.443.98-.99%200-.548-.438-.992-.98-.992H50.5V23.953h.202z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-planning-development { background-image: url('data:image/svg+xml;charset=US-ASCII,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20x%3D%220px%22%20y%3D%220px%22%20%20width%3D%2232px%22%20height%3D%2232px%22%20viewBox%3D%220%200%2032%2032%22%20style%3D%22enable-background%3Anew%200%200%2032%2032%3B%22%20xml%3Aspace%3D%22preserve%22%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%20.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Ctitle%3Eplanning-development%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M3.4%2C26.6c-0.1-0.2-0.1-0.5-0.1-0.7c0-1.1%2C0.7-1.9%2C1.8-1.9h0.7c0.1%2C0%2C0.3-0.1%2C0.3-0.3V5.5h23.1v22.1H5%20C4.3%2C27.6%2C3.7%2C27.2%2C3.4%2C26.6%20M1.4%2C7.2v18.7c0%2C2%2C1.6%2C3.6%2C3.6%2C3.6h25c0.6%2C0%2C0.9-0.5%2C0.9-0.9v-24c0-0.6-0.5-0.9-0.9-0.9H6V1.4%20c0-0.1-0.1-0.2-0.3-0.2H5c-2-0.1-3.6%2C1.6-3.6%2C3.5V7.2%20M17.2%2C24.5h-4.7v-2.3h4.7V24.5z%20M11.2%2C9.5V8.6H19v1.2c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5%20c0.3%2C0%2C0.5-0.2%2C0.5-0.5V8.6h5v5.8h-5v-2.1c0-0.3-0.2-0.5-0.5-0.5c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v4.3c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5%20c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-1.3h5v6h-5v-1.6c0-0.3-0.2-0.5-0.5-0.5c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v1.6h-7.8v-6h5.1c0.3%2C0%2C0.5-0.2%2C0.5-0.5%20c0-0.3-0.2-0.5-0.5-0.5h-5.1v-1.3c0-0.3-0.2-0.5-0.5-0.5c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v8.7c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5h0.8V25%20c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5h5.6c0.3%2C0%2C0.5-0.2%2C0.5-0.5v-2.8h7.3c0.3%2C0%2C0.5-0.2%2C0.5-0.5V8.1c0-0.3-0.2-0.5-0.5-0.5H10.7%20c-0.3%2C0-0.5%2C0.2-0.5%2C0.5v1.5c0%2C0.3%2C0.2%2C0.5%2C0.5%2C0.5C11%2C10.1%2C11.2%2C9.8%2C11.2%2C9.5z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-planning-permission { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill-rule%3Aevenodd%3Bclip-rule%3Aevenodd%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M2.5%2021h26.8c.3%200%20.5-.2.5-.5V5.7c0-1.4-1.1-2.5-2.5-2.5H4.5C3.1%203.2%202%204.3%202%205.7v14.9c0%20.2.2.4.5.4zM4%205.2h23.8v13.9H4V5.2zM30.3%2022c.3%200%20.5.2.5.5v2c0%201.4-1.1%202.5-2.5%202.5H3.5C2.1%2027%201%2025.9%201%2024.5v-2c0-.2.2-.5.5-.5h11.9c.3%200%20.5.2.5.5v.5h4v-.5c0-.3.2-.5.5-.5h11.9M12.5%2011.8v4.7h2.3v-2.9H17v2.9h2.3v-4.7l-3.4-3.5-3.4%203.5zm6.6-1.6c.1%200%20.1%200%200%200%20.1%200%20.2-.1.2-.2V8.2c0-.1-.1-.2-.2-.2h-1.8c-.1%200-.1%200-.1.1v.1l1.9%202zm1.4%202c.1.1.1.2%200%20.2-.1.1-.2.1-.2%200l-4.4-4.6-3.4%203.5-1%201.1c-.1.1-.2.1-.2%200v-.1-.2l4.5-4.7c.1-.1.2-.1.2%200l4.5%204.8%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-plus-btn { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2230.3%22%20height%3D%2230%22%20viewBox%3D%22-482%20486%2030.3%2030%22%3E%3Cstyle%3E.st0%7Bfill%3A%230072B3%3B%7D%3C%2Fstyle%3E%3Ctitle%3Eplus-btn%3C%2Ftitle%3E%3Cg%20id%3D%22ICONS%22%3E%3Cg%20id%3D%22plus-btn%22%3E%3Cpath%20id%3D%22_x2B_%22%20class%3D%22st0%22%20d%3D%22M-471.1%20516v-11.2H-482v-7.6h10.9V486h8.6v11.2h10.9v7.6h-10.9V516h-8.6z%22%2F%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-recycling { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Erecycling%3C%2Ftitle%3E%3Cpath%20d%3D%22M1.3%2020.1l3.632%202.84-3.417%206.557c-1.71%203.023%201.227%205.968%203.097%206.993%201.84%201.01%204.698%201.13%207.368%201.093l4.805-7.867%203.63%201.966-6.3-11.69L1.3%2020.1zm.535%2016.05L9.63%2050.57c1.567%202.003%204.52%202.477%207.582%202.404h8.222v-13.66l-15.59-.108c-2.42.146-5.588-.364-8.01-3.06zM50.88%209.567l-4.242%201.803-4.07-6.17c-1.81-2.963-5.806-1.82-7.607-.68-1.773%201.125-3.263%203.57-4.526%205.926l4.54%208.023-3.477%202.226%2013.265.15L50.88%209.567zM36.604%202.255L20.23%202.09c-2.51.4-4.355%202.76-5.775%205.476l-3.987%207.203%2011.928%206.62L30.05%207.788c1.046-2.19%203.028-4.72%206.555-5.532zm.712%2055.654l.482-4.59%207.36-.572c3.466-.15%204.405-4.204%204.282-6.336-.12-2.098-1.534-4.59-2.98-6.837l-9.208.088-.26-4.126-6.56%2011.547%206.883%2010.825zm13.307-8.96l8.082-14.263c.866-2.39-.298-5.152-1.982-7.713l-4.357-6.983L40.8%2027.23l8.17%2013.3c1.406%201.98%202.653%204.94%201.654%208.423z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-red-arrow { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%3Ctitle%3Ered-arrow%3C%2Ftitle%3E%3Cdefs%3E%3Cpath%20id%3D%22a%22%20d%3D%22M12.046%207.2h11.242v17.6H12.046%22%2F%3E%3C%2Fdefs%3E%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20fill%3D%22%23DD1219%22%20d%3D%22M0%200h32v32H0z%22%2F%3E%3Cmask%20id%3D%22b%22%20fill%3D%22%23fff%22%3E%3Cuse%20xlink%3Ahref%3D%22%23a%22%2F%3E%3C%2Fmask%3E%3Cpath%20d%3D%22M23.086%2016.423l-10.118%208.25c-.104.083-.23.127-.36.127-.08%200-.162-.017-.238-.052-.198-.09-.324-.284-.324-.498v-4.4c0-.17.08-.33.217-.434L16.75%2016l-4.487-3.416c-.137-.104-.217-.264-.217-.434v-4.4c0-.213.126-.408.324-.498.196-.09.43-.062.598.075l10.118%208.25c.128.105.202.26.202.423%200%20.163-.074.318-.202.423%22%20fill%3D%22%23FFF%22%20mask%3D%22url%28%23b%29%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-register-to-vote { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eregister-to-vote%3C%2Ftitle%3E%3Cpath%20d%3D%22M25.674%2029.287H7.31v-8.334h18.364v8.334zM10.757%2014.705l2.55%202.55h-2.012c-.212%200-.386.173-.386.384%200%20.212.173.385.385.385H21.69c.213%200%20.384-.173.384-.386%200-.212-.17-.384-.383-.384h-6.078l4.008-4.008h1.682l3.427%205.395H8.256l2.5-3.938zm.618-3.768l7.15-7.147%203.643%203.643-3.506%203.504-2.31%202.31-1.894%201.896-1.893-1.895-1.75-1.752.56-.56zM28%2019.8c0-.066-.024-.124-.033-.186l-.015-.078c-.03-.116-.072-.222-.133-.323-.015-.024-.028-.05-.047-.075-.02-.032-.034-.067-.058-.096l-4.804-7.567c-.21-.336-.578-.538-.973-.538h-.008l2.687-2.69c.454-.45.454-1.18%200-1.63l-5.274-5.28C19.125%201.124%2018.83%201%2018.525%201c-.307%200-.6.123-.816.338L8.365%2010.68c-.45.452-.45%201.183%200%201.634l.716.717-3.9%206.15c-.008.01-.01.02-.015.03-.042.068-.073.14-.1.215-.01.024-.016.048-.024.075-.02.07-.03.14-.033.215-.003.022-.008.043-.008.062L5%2019.8v10.643c0%20.637.516%201.153%201.156%201.153H26.83c.637%200%201.153-.516%201.153-1.153V19.95c.008-.05.017-.097.017-.15z%22%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-rss { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232.1%22%20height%3D%2232.1%22%20viewBox%3D%220%200%2032.1%2032.1%22%3E%3Cstyle%3E.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20id%3D%22icon%22%20class%3D%22st0%22%20d%3D%22M22.5%2026.5c0-9.4-7.6-17-16.8-17v-4c5.5%200%2010.9%202.4%2014.7%206.2s6.1%209.1%206.1%2014.9l-4-.1zm-7.1%200c0-2.7-1-5.1-2.8-7s-4.5-2.9-6.8-2.9v-4c3.6%200%207.2%201.6%209.7%204.1s4%206%204%209.8h-4.1zm-5-.8c-.5.5-1.2.8-2%20.8s-1.5-.3-2-.8v-.1c-.5-.5-.8-1.2-.8-1.9%200-.8.3-1.4.8-1.9s1.2-.8%201.9-.8c.8%200%201.4.3%201.9.8h.1c.5.5.8%201.2.8%202%20.1.7-.2%201.3-.7%201.9zM0%2032.1h32.1V0H0v32.1z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-twitter1 { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%2326A9E0%3B%7D%3C%2Fstyle%3E%3Ctitle%3Etwitter1%3C%2Ftitle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M27.9%2010v.8c0%208-6.2%2017.2-17.5%2017.2-3.5%200-6.7-1-9.4-2.7.5.1%201%20.1%201.5.1%202.9%200%205.5-1%207.6-2.6-2.7%200-5-1.8-5.7-4.2.4.1.8.1%201.2.1.6%200%201.1-.1%201.6-.2-2.8-.6-4.9-3-4.9-5.9v-.1c.7.4%201.7.7%202.7.7-1.6-1.1-2.7-2.9-2.7-5%200-1.1.3-2.2.8-3%203%203.7%207.6%206.1%2012.7%206.3-.1-.4-.2-.9-.2-1.4%200-3.3%202.8-6.1%206.1-6.1%201.8%200%203.4.7%204.5%201.9%201.4-.3%202.7-.8%203.9-1.5-.5%201.4-1.4%202.6-2.7%203.4%201.2-.1%202.4-.5%203.5-1-.8%201.3-1.8%202.3-3%203.2%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-twitter2 { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20id%3D%22Fill-3%22%20class%3D%22st0%22%20d%3D%22M24.1%2011.8v.5c0%205.5-4.2%2011.9-11.8%2011.9-2.3%200-4.5-.7-6.4-1.9.3%200%20.7.1%201%20.1%201.9%200%203.7-.7%205.2-1.8-1.8%200-3.3-1.2-3.9-2.9.3%200%20.5.1.8.1.4%200%20.7-.1%201.1-.1-1.9-.4-3.3-2.1-3.3-4.1v-.1c.6.3%201.2.5%201.9.5-1.1-.7-1.8-2-1.8-3.5%200-.8.2-1.5.6-2.1%202%202.5%205.1%204.2%208.5%204.4-.1-.3-.1-.6-.1-1%200-2.3%201.9-4.2%204.1-4.2%201.2%200%202.3.5%203%201.3.9-.2%201.8-.5%202.6-1-.3%201-1%201.8-1.8%202.3.8-.1%201.6-.3%202.4-.7-.6%201-1.3%201.7-2.1%202.3zM0%2032h32V0H0v32z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-warning { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23221F20%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M18.4%2012.5l-.9%206.4c-.1.9-1%201.6-1.9%201.4-.7-.1-1.3-.7-1.4-1.4l-1-6.4c-.2-1.5.7-2.9%202.2-3.1%201.5-.3%202.8.7%203.1%202.2-.1.4-.1.7-.1.9m-2.6%2013.4c-1%200-1.9-.8-1.9-1.9s.8-1.9%201.9-1.9%201.9.8%201.9%201.9-.9%201.9-1.9%201.9M30%2023.5L18.7%205.4c-.7-1-1.7-1.6-2.9-1.6s-2.2.7-2.9%201.6L1.6%2023.5c-.7%201.1-.7%202.4-.1%203.6.6%201.1%201.8%201.9%203%201.9h22.6c1.3%200%202.4-.7%203-1.9.6-1.1.6-2.5-.1-3.6%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-your-community { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eyour-community%3C%2Ftitle%3E%3Cpath%20d%3D%22M53.693%2022.59c-1.784%200-3.233%201.427-3.233%203.18%200%201.75%201.45%203.176%203.233%203.176%201.778%200%203.226-1.425%203.226-3.177%200-1.753-1.45-3.18-3.227-3.18zm-46.387%200c-1.785%200-3.233%201.427-3.233%203.18%200%201.75%201.448%203.176%203.233%203.176%201.78%200%203.227-1.425%203.227-3.177%200-1.753-1.448-3.18-3.227-3.18zm36.784-5.78c-2.65%200-4.798%202.123-4.798%204.734%200%202.606%202.15%204.723%204.798%204.723%202.65%200%204.805-2.117%204.805-4.723%200-2.61-2.155-4.733-4.805-4.733zm14.902%2028.76h-5.47v-9.916c0-1.703-.51-3.285-1.326-4.664.482-.14.975-.237%201.497-.237%202.917%200%205.3%202.346%205.3%205.226v9.59zm-42.09-28.76c-2.652%200-4.806%202.123-4.806%204.734%200%202.606%202.154%204.723%204.806%204.723%202.642%200%204.796-2.117%204.796-4.723%200-2.61-2.153-4.733-4.796-4.733zM7.306%2030.754c.52%200%201.008.098%201.49.237-.824%201.38-1.324%202.96-1.324%204.664v9.917H2v-9.59c0-2.882%202.383-5.227%205.306-5.227zM30.49%207.363c-3.91%200-7.098%203.136-7.098%206.99%200%203.856%203.185%206.996%207.1%206.996%203.913%200%207.102-3.14%207.102-6.996.003-3.856-3.19-6.992-7.103-6.992zm21.274%2041.9h-8.38v-15.09c0-2.075-.557-4.005-1.456-5.736.686-.2%201.408-.34%202.163-.34%204.23%200%207.674%203.385%207.674%207.557v13.608zM17.6%2034.172v15.09H9.23v-13.61c0-4.167%203.44-7.557%207.675-7.557.755%200%201.47.14%202.154.34-.9%201.732-1.46%203.662-1.46%205.737zm1.757%2019.457h22.27V34.173c0-6.047-4.998-10.965-11.137-10.965-6.143%200-11.133%204.918-11.133%2010.965V53.63z%22%20fill%3D%22%23010002%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-your-council { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eyour-council%3C%2Ftitle%3E%3Cpath%20d%3D%22M40.152%2028.19v-2.543h1.59v-1.113l-1.59-.604v-1.337h-3.197l-6.942-2.898v-4.973h-.637v.672c-.127.1-.292.19-.504.216-.48.046-.962.072-1.322.575l.13%201.184s.48-.53.855-.576c.3-.043.534.044.84-.126v3.047l-6.81%202.878h-3.136v1.33l-1.594.614v1.147h1.593v2.507H1v18.16h57.53V28.19H40.153zM4.528%2043.7h-1.63v-4.946h1.63V43.7zm0-7.92h-1.63v-3.51h1.63v3.51zM8.94%2043.7H7.31v-4.946h1.63V43.7zm0-7.92H7.31v-3.51h1.63v3.51zm4.42%207.92h-1.634v-4.946h1.634V43.7zm0-7.92h-1.634v-3.51h1.634v3.51zm4.417%207.92h-1.632v-4.946h1.63l.002%204.945zm0-7.92h-1.632v-3.51h1.63l.002%203.51zm11.198-3.512h1.628v3.51h-1.628v-3.51zm-4.788%2011.43h-1.625v-4.944h1.625V43.7zm0-7.917h-1.625v-3.51h1.625v3.51zm6.688%207.92h-2.172v-4.19h2.172v4.19zm6.147%200h-1.628v-4.946h1.628V43.7zm0-7.92h-1.628v-3.51h1.628v3.51zm6.417%207.92h-1.63v-4.946h1.63V43.7zm0-7.92h-1.63v-3.51h1.63v3.51zm4.415%207.92h-1.63l-.002-4.946h1.632V43.7zm0-7.92h-1.63l-.002-3.51h1.632v3.51zm4.413%207.92H50.64v-4.946h1.628V43.7zm0-7.92H50.64v-3.51h1.628v3.51zm4.42%207.92h-1.635v-4.946h1.634V43.7zm0-7.92h-1.635v-3.51h1.634v3.51z%22%20fill%3D%22%23030104%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-your-environment { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2260%22%20height%3D%2260%22%20viewBox%3D%220%200%2060%2060%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ctitle%3Eyour-environment%3C%2Ftitle%3E%3Cg%20fill%3D%22%23000%22%20fill-rule%3D%22evenodd%22%3E%3Cpath%20d%3D%22M21.886%2032.07c-1.474-.626-2.567-1.606-3.268-2.907-.94-1.74-2.253-3.124-3.625-4.492-.588-.584-1.282-.864-2.096-.754-.455.065.076%202.72%201.453%204.083-.765.25-4.14-5.228-4.778-5.772l-2.94-3.765c-1.1-1.28-.644-1.728-2.487-2.233-.067-.017-.123-.073-.167-.126-.616-.687-1.196-.848-1.994-.777-.462.038-.753.36-.933.762-.187.416.195.638.343.977.91%202.082%201.102%202.854%202.644%205.375%201.097%201.794%202.072%203.63%203.196%205.39.463.73.97%201.435%201.207%202.272.503%201.776%201.53%203.182%202.903%204.42%201.557%201.41%202.99%202.95%204.494%204.42%202.635%202.583%203.575%2013.796%202.615%2017.417l8.45.13c-.635-4.432-.033-4.88.628-9.204.516-3.374.086-6.692-.612-9.953-.563-2.643-2.633-4.247-5.032-5.263zM58.56%2016.09c-.182-.403-.47-.725-.934-.763-.797-.07-1.378.09-1.993.777-.046.05-.103.11-.168.124-1.843.507-1.39.952-2.49%202.233l-2.938%203.763c-.638.544-4.01%206.023-4.777%205.77%201.377-1.363%201.91-4.016%201.452-4.08-.813-.11-1.507.17-2.095.754-1.372%201.368-2.685%202.752-3.624%204.49-.703%201.304-1.794%202.285-3.268%202.908-2.4%201.017-4.47%202.62-5.036%205.265-.697%203.26-1.125%206.58-.61%209.952.603%203.93%201.433%205.256.624%209.204l8.45-.128c-.96-3.62-.018-14.833%202.615-17.416%201.505-1.47%202.94-3.01%204.496-4.42%201.374-1.238%202.4-2.642%202.9-4.42.238-.84.745-1.544%201.21-2.27%201.123-1.76%202.1-3.597%203.196-5.392%201.54-2.523%201.733-3.293%202.643-5.375.15-.337.53-.56.344-.976z%22%2F%3E%3Cpath%20d%3D%22M43.65%2017.993c0-7.66-6.273-13.87-14.013-13.87-7.737%200-14.01%206.208-14.01%2013.87%200%207.66%206.273%2013.87%2014.01%2013.87%207.742%200%2014.013-6.21%2014.013-13.87zm-7.426%205.76c-3.998%201.3-7.135%203.92-6.495%205.01-1.328-.205-2.583-.62-3.722-1.228.582-.668%201.56-1.687%203-2.83%202.497-1.976-2.994-3.953-6.323-4.944-3.33-.987-.833-3.296%202.004-6.36%202.242-2.424.937-4.65.292-5.474%201.864-1.26%204.114-2%206.54-2%202.23%200%204.306.636%206.077%201.72-.075.04-.147.065-.22.125-1.312%201.11-.3%203.09-.612%204.45-.498%201.976-3.623-1.698-4.933-1.574-1.25.124-4.053%204.067-2.195%207.348%201.86%203.28%205.315%201.05%205.315%201.05s4.36-2.004%205.797-1.57c.753.2%201.264.536%201.756.885-.493%202.27-1.422%204.234-2.336%205.747-.34-.778-1.662-1.1-3.948-.355z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
-.icon-youtube { background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20id%3D%22Layer_1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2231.8%22%20height%3D%2232%22%20viewBox%3D%220%200%2031.8%2032%22%3E%3Cstyle%3E.st0%7Bfill%3A%23FFFFFF%3B%7D%3C%2Fstyle%3E%3Cpath%20class%3D%22st0%22%20d%3D%22M13.4%2020l6.4-4.2-6.4-4.2V20zm13.6.5c0%201.9-1.5%203.4-3.3%203.4H8.1c-1.8%200-3.3-1.5-3.3-3.4v-9c0-1.9%201.4-3.3%203.3-3.3h15.6c1.8%200%203.3%201.4%203.3%203.3v9zM0%2032h31.8V0H0v32z%22%2F%3E%3C%2Fsvg%3E'); background-repeat: no-repeat; }
-
diff --git a/web/cobrands/harrogate/icons/icons.fallback.css b/web/cobrands/harrogate/icons/icons.fallback.css
deleted file mode 100644
index e7d893da5..000000000
--- a/web/cobrands/harrogate/icons/icons.fallback.css
+++ /dev/null
@@ -1,157 +0,0 @@
-.icon-arrow-down-white { background-image: url('png/arrow-down-white.png'); background-repeat: no-repeat; }
-
-.icon-arrow-down { background-image: url('png/arrow-down.png'); background-repeat: no-repeat; }
-
-.icon-arrow-left-white { background-image: url('png/arrow-left-white.png'); background-repeat: no-repeat; }
-
-.icon-arrow-left { background-image: url('png/arrow-left.png'); background-repeat: no-repeat; }
-
-.icon-arrow-up-white { background-image: url('png/arrow-up-white.png'); background-repeat: no-repeat; }
-
-.icon-arrow-up { background-image: url('png/arrow-up.png'); background-repeat: no-repeat; }
-
-.icon-arrow-white { background-image: url('png/arrow-white.png'); background-repeat: no-repeat; }
-
-.icon-arrow { background-image: url('png/arrow.png'); background-repeat: no-repeat; }
-
-.icon-balloons { background-image: url('png/balloons.png'); background-repeat: no-repeat; }
-
-.icon-benefits-assistance { background-image: url('png/benefits-assistance.png'); background-repeat: no-repeat; }
-
-.icon-bins-recycling { background-image: url('png/bins-recycling.png'); background-repeat: no-repeat; }
-
-.icon-business-and-investment { background-image: url('png/business-and-investment.png'); background-repeat: no-repeat; }
-
-.icon-business-investment { background-image: url('png/business-investment.png'); background-repeat: no-repeat; }
-
-.icon-car-service { background-image: url('png/car-service.png'); background-repeat: no-repeat; }
-
-.icon-castle { background-image: url('png/castle.png'); background-repeat: no-repeat; }
-
-.icon-close-btn-dark { background-image: url('png/close-btn-dark.png'); background-repeat: no-repeat; }
-
-.icon-close-btn1 { background-image: url('png/close-btn1.png'); background-repeat: no-repeat; }
-
-.icon-close-btn2 { background-image: url('png/close-btn2.png'); background-repeat: no-repeat; }
-
-.icon-consultations { background-image: url('png/consultations.png'); background-repeat: no-repeat; }
-
-.icon-council-tax { background-image: url('png/council-tax.png'); background-repeat: no-repeat; }
-
-.icon-crime-and-emergency { background-image: url('png/crime-and-emergency.png'); background-repeat: no-repeat; }
-
-.icon-crime-emergencies { background-image: url('png/crime-emergencies.png'); background-repeat: no-repeat; }
-
-.icon-elections { background-image: url('png/elections.png'); background-repeat: no-repeat; }
-
-.icon-envelope { background-image: url('png/envelope.png'); background-repeat: no-repeat; }
-
-.icon-error { background-image: url('png/error.png'); background-repeat: no-repeat; }
-
-.icon-events-celebrations { background-image: url('png/events-celebrations.png'); background-repeat: no-repeat; }
-
-.icon-events { background-image: url('png/events.png'); background-repeat: no-repeat; }
-
-.icon-facebook { background-image: url('png/facebook.png'); background-repeat: no-repeat; }
-
-.icon-fax { background-image: url('png/fax.png'); background-repeat: no-repeat; }
-
-.icon-flower { background-image: url('png/flower.png'); background-repeat: no-repeat; }
-
-.icon-food-hygiene { background-image: url('png/food-hygiene.png'); background-repeat: no-repeat; }
-
-.icon-forms { background-image: url('png/forms.png'); background-repeat: no-repeat; }
-
-.icon-gym-membership { background-image: url('png/gym-membership.png'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu-white { background-image: url('png/hamburger-menu-white.png'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu { background-image: url('png/hamburger-menu.png'); background-repeat: no-repeat; }
-
-.icon-hamburger-menu2 { background-image: url('png/hamburger-menu2.png'); background-repeat: no-repeat; }
-
-.icon-harrogate-map { background-image: url('png/harrogate-map.png'); background-repeat: no-repeat; }
-
-.icon-health-and-safety { background-image: url('png/health-and-safety.png'); background-repeat: no-repeat; }
-
-.icon-health-safety { background-image: url('png/health-safety.png'); background-repeat: no-repeat; }
-
-.icon-homes-property { background-image: url('png/homes-property.png'); background-repeat: no-repeat; }
-
-.icon-hydro-swimming-pool { background-image: url('png/hydro-swimming-pool.png'); background-repeat: no-repeat; }
-
-.icon-icon-bank { background-image: url('png/icon-bank.png'); background-repeat: no-repeat; }
-
-.icon-information { background-image: url('png/information.png'); background-repeat: no-repeat; }
-
-.icon-jobs { background-image: url('png/jobs.png'); background-repeat: no-repeat; }
-
-.icon-leisure-sport { background-image: url('png/leisure-sport.png'); background-repeat: no-repeat; }
-
-.icon-licences-permissions { background-image: url('png/licences-permissions.png'); background-repeat: no-repeat; }
-
-.icon-licensing-and-permissions { background-image: url('png/licensing-and-permissions.png'); background-repeat: no-repeat; }
-
-.icon-link { background-image: url('png/link.png'); background-repeat: no-repeat; }
-
-.icon-magnifying-glass-white { background-image: url('png/magnifying-glass-white.png'); background-repeat: no-repeat; }
-
-.icon-magnifying-glass { background-image: url('png/magnifying-glass.png'); background-repeat: no-repeat; }
-
-.site-content address:before,
-.icon-map-pointer { background-image: url('png/map-pointer.png'); background-repeat: no-repeat; }
-
-.icon-map { background-image: url('png/map.png'); background-repeat: no-repeat; }
-
-.icon-menu-up { background-image: url('png/menu-up.png'); background-repeat: no-repeat; }
-
-.icon-minus-btn { background-image: url('png/minus-btn.png'); background-repeat: no-repeat; }
-
-.icon-missed-bin-collection { background-image: url('png/missed-bin-collection.png'); background-repeat: no-repeat; }
-
-.icon-museums-galleries { background-image: url('png/museums-galleries.png'); background-repeat: no-repeat; }
-
-.icon-parking-travel { background-image: url('png/parking-travel.png'); background-repeat: no-repeat; }
-
-.icon-parking { background-image: url('png/parking.png'); background-repeat: no-repeat; }
-
-.icon-parks-openspaces { background-image: url('png/parks-openspaces.png'); background-repeat: no-repeat; }
-
-.icon-payments { background-image: url('png/payments.png'); background-repeat: no-repeat; }
-
-.icon-pest-control { background-image: url('png/pest-control.png'); background-repeat: no-repeat; }
-
-.icon-phone { background-image: url('png/phone.png'); background-repeat: no-repeat; }
-
-.icon-pin { background-image: url('png/pin.png'); background-repeat: no-repeat; }
-
-.icon-planning-and-development { background-image: url('png/planning-and-development.png'); background-repeat: no-repeat; }
-
-.icon-planning-development { background-image: url('png/planning-development.png'); background-repeat: no-repeat; }
-
-.icon-planning-permission { background-image: url('png/planning-permission.png'); background-repeat: no-repeat; }
-
-.icon-plus-btn { background-image: url('png/plus-btn.png'); background-repeat: no-repeat; }
-
-.icon-recycling { background-image: url('png/recycling.png'); background-repeat: no-repeat; }
-
-.icon-red-arrow { background-image: url('png/red-arrow.png'); background-repeat: no-repeat; }
-
-.icon-register-to-vote { background-image: url('png/register-to-vote.png'); background-repeat: no-repeat; }
-
-.icon-rss { background-image: url('png/rss.png'); background-repeat: no-repeat; }
-
-.icon-twitter1 { background-image: url('png/twitter1.png'); background-repeat: no-repeat; }
-
-.icon-twitter2 { background-image: url('png/twitter2.png'); background-repeat: no-repeat; }
-
-.icon-warning { background-image: url('png/warning.png'); background-repeat: no-repeat; }
-
-.icon-your-community { background-image: url('png/your-community.png'); background-repeat: no-repeat; }
-
-.icon-your-council { background-image: url('png/your-council.png'); background-repeat: no-repeat; }
-
-.icon-your-environment { background-image: url('png/your-environment.png'); background-repeat: no-repeat; }
-
-.icon-youtube { background-image: url('png/youtube.png'); background-repeat: no-repeat; }
-
diff --git a/web/cobrands/harrogate/icons/png/arrow-down-white.png b/web/cobrands/harrogate/icons/png/arrow-down-white.png
deleted file mode 100644
index 145000542..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-down-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-down.png b/web/cobrands/harrogate/icons/png/arrow-down.png
deleted file mode 100644
index 6c849e4fd..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-down.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-left-white.png b/web/cobrands/harrogate/icons/png/arrow-left-white.png
deleted file mode 100644
index 40dadca6a..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-left-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-left.png b/web/cobrands/harrogate/icons/png/arrow-left.png
deleted file mode 100644
index 98aea4120..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-left.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-up-white.png b/web/cobrands/harrogate/icons/png/arrow-up-white.png
deleted file mode 100644
index f43d89fab..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-up-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-up.png b/web/cobrands/harrogate/icons/png/arrow-up.png
deleted file mode 100644
index 4c99f7f10..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-up.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow-white.png b/web/cobrands/harrogate/icons/png/arrow-white.png
deleted file mode 100644
index 2e21876ba..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/arrow.png b/web/cobrands/harrogate/icons/png/arrow.png
deleted file mode 100644
index 75452fadb..000000000
Binary files a/web/cobrands/harrogate/icons/png/arrow.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/balloons.png b/web/cobrands/harrogate/icons/png/balloons.png
deleted file mode 100644
index 1986a74ae..000000000
Binary files a/web/cobrands/harrogate/icons/png/balloons.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/benefits-assistance.png b/web/cobrands/harrogate/icons/png/benefits-assistance.png
deleted file mode 100644
index 8819bb69f..000000000
Binary files a/web/cobrands/harrogate/icons/png/benefits-assistance.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/bins-recycling.png b/web/cobrands/harrogate/icons/png/bins-recycling.png
deleted file mode 100644
index 49971e1ab..000000000
Binary files a/web/cobrands/harrogate/icons/png/bins-recycling.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/business-and-investment.png b/web/cobrands/harrogate/icons/png/business-and-investment.png
deleted file mode 100644
index 893f543b6..000000000
Binary files a/web/cobrands/harrogate/icons/png/business-and-investment.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/business-investment.png b/web/cobrands/harrogate/icons/png/business-investment.png
deleted file mode 100644
index 44cae5643..000000000
Binary files a/web/cobrands/harrogate/icons/png/business-investment.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/car-service.png b/web/cobrands/harrogate/icons/png/car-service.png
deleted file mode 100644
index 69de7af1d..000000000
Binary files a/web/cobrands/harrogate/icons/png/car-service.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/castle.png b/web/cobrands/harrogate/icons/png/castle.png
deleted file mode 100644
index 1c2be330a..000000000
Binary files a/web/cobrands/harrogate/icons/png/castle.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/close-btn-dark.png b/web/cobrands/harrogate/icons/png/close-btn-dark.png
deleted file mode 100644
index 533bb05b1..000000000
Binary files a/web/cobrands/harrogate/icons/png/close-btn-dark.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/close-btn1.png b/web/cobrands/harrogate/icons/png/close-btn1.png
deleted file mode 100644
index 57e5a7f9e..000000000
Binary files a/web/cobrands/harrogate/icons/png/close-btn1.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/close-btn2.png b/web/cobrands/harrogate/icons/png/close-btn2.png
deleted file mode 100644
index ac2d77208..000000000
Binary files a/web/cobrands/harrogate/icons/png/close-btn2.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/consultations.png b/web/cobrands/harrogate/icons/png/consultations.png
deleted file mode 100644
index 5df725e7a..000000000
Binary files a/web/cobrands/harrogate/icons/png/consultations.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/council-tax.png b/web/cobrands/harrogate/icons/png/council-tax.png
deleted file mode 100644
index e52a91a30..000000000
Binary files a/web/cobrands/harrogate/icons/png/council-tax.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/crime-and-emergency.png b/web/cobrands/harrogate/icons/png/crime-and-emergency.png
deleted file mode 100644
index 1556289e1..000000000
Binary files a/web/cobrands/harrogate/icons/png/crime-and-emergency.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/crime-emergencies.png b/web/cobrands/harrogate/icons/png/crime-emergencies.png
deleted file mode 100644
index a78a006c8..000000000
Binary files a/web/cobrands/harrogate/icons/png/crime-emergencies.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/elections.png b/web/cobrands/harrogate/icons/png/elections.png
deleted file mode 100644
index 4faa6f549..000000000
Binary files a/web/cobrands/harrogate/icons/png/elections.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/envelope.png b/web/cobrands/harrogate/icons/png/envelope.png
deleted file mode 100644
index 3020b1db8..000000000
Binary files a/web/cobrands/harrogate/icons/png/envelope.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/error.png b/web/cobrands/harrogate/icons/png/error.png
deleted file mode 100644
index 6305f7e6c..000000000
Binary files a/web/cobrands/harrogate/icons/png/error.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/events-celebrations.png b/web/cobrands/harrogate/icons/png/events-celebrations.png
deleted file mode 100644
index 7fb94e58b..000000000
Binary files a/web/cobrands/harrogate/icons/png/events-celebrations.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/events.png b/web/cobrands/harrogate/icons/png/events.png
deleted file mode 100644
index a948363ca..000000000
Binary files a/web/cobrands/harrogate/icons/png/events.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/facebook.png b/web/cobrands/harrogate/icons/png/facebook.png
deleted file mode 100644
index cc56ee705..000000000
Binary files a/web/cobrands/harrogate/icons/png/facebook.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/fax.png b/web/cobrands/harrogate/icons/png/fax.png
deleted file mode 100644
index 9d79f1859..000000000
Binary files a/web/cobrands/harrogate/icons/png/fax.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/flower.png b/web/cobrands/harrogate/icons/png/flower.png
deleted file mode 100644
index c7602b852..000000000
Binary files a/web/cobrands/harrogate/icons/png/flower.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/food-hygiene.png b/web/cobrands/harrogate/icons/png/food-hygiene.png
deleted file mode 100644
index d2183257a..000000000
Binary files a/web/cobrands/harrogate/icons/png/food-hygiene.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/forms.png b/web/cobrands/harrogate/icons/png/forms.png
deleted file mode 100644
index d8f0305a9..000000000
Binary files a/web/cobrands/harrogate/icons/png/forms.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/gym-membership.png b/web/cobrands/harrogate/icons/png/gym-membership.png
deleted file mode 100644
index 58c646b31..000000000
Binary files a/web/cobrands/harrogate/icons/png/gym-membership.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/hamburger-menu-white.png b/web/cobrands/harrogate/icons/png/hamburger-menu-white.png
deleted file mode 100644
index 3e08c5328..000000000
Binary files a/web/cobrands/harrogate/icons/png/hamburger-menu-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/hamburger-menu.png b/web/cobrands/harrogate/icons/png/hamburger-menu.png
deleted file mode 100644
index ad039dff1..000000000
Binary files a/web/cobrands/harrogate/icons/png/hamburger-menu.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/hamburger-menu2.png b/web/cobrands/harrogate/icons/png/hamburger-menu2.png
deleted file mode 100644
index c17264a70..000000000
Binary files a/web/cobrands/harrogate/icons/png/hamburger-menu2.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/harrogate-map.png b/web/cobrands/harrogate/icons/png/harrogate-map.png
deleted file mode 100644
index 29393a241..000000000
Binary files a/web/cobrands/harrogate/icons/png/harrogate-map.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/health-and-safety.png b/web/cobrands/harrogate/icons/png/health-and-safety.png
deleted file mode 100644
index 59537264d..000000000
Binary files a/web/cobrands/harrogate/icons/png/health-and-safety.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/health-safety.png b/web/cobrands/harrogate/icons/png/health-safety.png
deleted file mode 100644
index ca71fc3ff..000000000
Binary files a/web/cobrands/harrogate/icons/png/health-safety.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/homes-property.png b/web/cobrands/harrogate/icons/png/homes-property.png
deleted file mode 100644
index 4fd94128a..000000000
Binary files a/web/cobrands/harrogate/icons/png/homes-property.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/hydro-swimming-pool.png b/web/cobrands/harrogate/icons/png/hydro-swimming-pool.png
deleted file mode 100644
index 7be378b1e..000000000
Binary files a/web/cobrands/harrogate/icons/png/hydro-swimming-pool.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/icon-bank.png b/web/cobrands/harrogate/icons/png/icon-bank.png
deleted file mode 100644
index f70387e87..000000000
Binary files a/web/cobrands/harrogate/icons/png/icon-bank.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/information.png b/web/cobrands/harrogate/icons/png/information.png
deleted file mode 100644
index c949e6650..000000000
Binary files a/web/cobrands/harrogate/icons/png/information.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/jobs.png b/web/cobrands/harrogate/icons/png/jobs.png
deleted file mode 100644
index 613daecf3..000000000
Binary files a/web/cobrands/harrogate/icons/png/jobs.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/leisure-sport.png b/web/cobrands/harrogate/icons/png/leisure-sport.png
deleted file mode 100644
index 110a1a56f..000000000
Binary files a/web/cobrands/harrogate/icons/png/leisure-sport.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/licences-permissions.png b/web/cobrands/harrogate/icons/png/licences-permissions.png
deleted file mode 100644
index 72e7699ee..000000000
Binary files a/web/cobrands/harrogate/icons/png/licences-permissions.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/licensing-and-permissions.png b/web/cobrands/harrogate/icons/png/licensing-and-permissions.png
deleted file mode 100644
index d5eb30757..000000000
Binary files a/web/cobrands/harrogate/icons/png/licensing-and-permissions.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/link.png b/web/cobrands/harrogate/icons/png/link.png
deleted file mode 100644
index 35e3bc3af..000000000
Binary files a/web/cobrands/harrogate/icons/png/link.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/magnifying-glass-white.png b/web/cobrands/harrogate/icons/png/magnifying-glass-white.png
deleted file mode 100644
index e34cba030..000000000
Binary files a/web/cobrands/harrogate/icons/png/magnifying-glass-white.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/magnifying-glass.png b/web/cobrands/harrogate/icons/png/magnifying-glass.png
deleted file mode 100644
index 086b01c06..000000000
Binary files a/web/cobrands/harrogate/icons/png/magnifying-glass.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/map-pointer.png b/web/cobrands/harrogate/icons/png/map-pointer.png
deleted file mode 100644
index 5016b922d..000000000
Binary files a/web/cobrands/harrogate/icons/png/map-pointer.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/map.png b/web/cobrands/harrogate/icons/png/map.png
deleted file mode 100644
index d6371fa5c..000000000
Binary files a/web/cobrands/harrogate/icons/png/map.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/menu-up.png b/web/cobrands/harrogate/icons/png/menu-up.png
deleted file mode 100644
index 40f35d0ac..000000000
Binary files a/web/cobrands/harrogate/icons/png/menu-up.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/minus-btn.png b/web/cobrands/harrogate/icons/png/minus-btn.png
deleted file mode 100644
index a7b2281ab..000000000
Binary files a/web/cobrands/harrogate/icons/png/minus-btn.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/missed-bin-collection.png b/web/cobrands/harrogate/icons/png/missed-bin-collection.png
deleted file mode 100644
index f5263c97a..000000000
Binary files a/web/cobrands/harrogate/icons/png/missed-bin-collection.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/museums-galleries.png b/web/cobrands/harrogate/icons/png/museums-galleries.png
deleted file mode 100644
index b33250d39..000000000
Binary files a/web/cobrands/harrogate/icons/png/museums-galleries.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/parking-travel.png b/web/cobrands/harrogate/icons/png/parking-travel.png
deleted file mode 100644
index 80baa6eac..000000000
Binary files a/web/cobrands/harrogate/icons/png/parking-travel.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/parking.png b/web/cobrands/harrogate/icons/png/parking.png
deleted file mode 100644
index c8a4c1a0f..000000000
Binary files a/web/cobrands/harrogate/icons/png/parking.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/parks-openspaces.png b/web/cobrands/harrogate/icons/png/parks-openspaces.png
deleted file mode 100644
index ec3068fe5..000000000
Binary files a/web/cobrands/harrogate/icons/png/parks-openspaces.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/payments.png b/web/cobrands/harrogate/icons/png/payments.png
deleted file mode 100644
index 9b59c0a3a..000000000
Binary files a/web/cobrands/harrogate/icons/png/payments.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/pest-control.png b/web/cobrands/harrogate/icons/png/pest-control.png
deleted file mode 100644
index 3ae4c719b..000000000
Binary files a/web/cobrands/harrogate/icons/png/pest-control.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/phone.png b/web/cobrands/harrogate/icons/png/phone.png
deleted file mode 100644
index 57bf59883..000000000
Binary files a/web/cobrands/harrogate/icons/png/phone.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/pin.png b/web/cobrands/harrogate/icons/png/pin.png
deleted file mode 100644
index fac93e803..000000000
Binary files a/web/cobrands/harrogate/icons/png/pin.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/planning-and-development.png b/web/cobrands/harrogate/icons/png/planning-and-development.png
deleted file mode 100644
index 8c50f869e..000000000
Binary files a/web/cobrands/harrogate/icons/png/planning-and-development.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/planning-development.png b/web/cobrands/harrogate/icons/png/planning-development.png
deleted file mode 100644
index d4c3c6c49..000000000
Binary files a/web/cobrands/harrogate/icons/png/planning-development.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/planning-permission.png b/web/cobrands/harrogate/icons/png/planning-permission.png
deleted file mode 100644
index 1d8552d08..000000000
Binary files a/web/cobrands/harrogate/icons/png/planning-permission.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/plus-btn.png b/web/cobrands/harrogate/icons/png/plus-btn.png
deleted file mode 100644
index d8d3298ff..000000000
Binary files a/web/cobrands/harrogate/icons/png/plus-btn.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/recycling.png b/web/cobrands/harrogate/icons/png/recycling.png
deleted file mode 100644
index c4e3be956..000000000
Binary files a/web/cobrands/harrogate/icons/png/recycling.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/red-arrow.png b/web/cobrands/harrogate/icons/png/red-arrow.png
deleted file mode 100644
index 4ea8f609d..000000000
Binary files a/web/cobrands/harrogate/icons/png/red-arrow.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/register-to-vote.png b/web/cobrands/harrogate/icons/png/register-to-vote.png
deleted file mode 100644
index 6e990077b..000000000
Binary files a/web/cobrands/harrogate/icons/png/register-to-vote.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/rss.png b/web/cobrands/harrogate/icons/png/rss.png
deleted file mode 100644
index 68cd4cb3a..000000000
Binary files a/web/cobrands/harrogate/icons/png/rss.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/twitter1.png b/web/cobrands/harrogate/icons/png/twitter1.png
deleted file mode 100644
index 8828e219f..000000000
Binary files a/web/cobrands/harrogate/icons/png/twitter1.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/twitter2.png b/web/cobrands/harrogate/icons/png/twitter2.png
deleted file mode 100644
index 1867f2b61..000000000
Binary files a/web/cobrands/harrogate/icons/png/twitter2.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/warning.png b/web/cobrands/harrogate/icons/png/warning.png
deleted file mode 100644
index 2d821c140..000000000
Binary files a/web/cobrands/harrogate/icons/png/warning.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/your-community.png b/web/cobrands/harrogate/icons/png/your-community.png
deleted file mode 100644
index 6c20b1ec1..000000000
Binary files a/web/cobrands/harrogate/icons/png/your-community.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/your-council.png b/web/cobrands/harrogate/icons/png/your-council.png
deleted file mode 100644
index 7e3e820e1..000000000
Binary files a/web/cobrands/harrogate/icons/png/your-council.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/your-environment.png b/web/cobrands/harrogate/icons/png/your-environment.png
deleted file mode 100644
index 4619fde47..000000000
Binary files a/web/cobrands/harrogate/icons/png/your-environment.png and /dev/null differ
diff --git a/web/cobrands/harrogate/icons/png/youtube.png b/web/cobrands/harrogate/icons/png/youtube.png
deleted file mode 100644
index 00c45016b..000000000
Binary files a/web/cobrands/harrogate/icons/png/youtube.png and /dev/null differ
diff --git a/web/cobrands/harrogate/js.js b/web/cobrands/harrogate/js.js
deleted file mode 100644
index 3c0e41d26..000000000
--- a/web/cobrands/harrogate/js.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// we link to the informational articles rather than the forms, because in some
-// cases the former have more information or links to track progress of faults
-// etc..
-
-(function() {
-
-var links = {
-    'Bus stops': 'http://www.northyorks.gov.uk/article/25853/Bus-stops-and-shelters',
-    // Pavements/footpaths (multiple options)
-    'Potholes': 'http://www.northyorks.gov.uk/article/25215/Roads---potholes',
-    // Roads/highways (multiple options)
-    'Road traffic signs': 'http://www.northyorks.gov.uk/article/25667/Road-signs-and-bollards',
-    // Street lighting (not considered, as also a Harrogate category)
-    'Traffic lights': 'http://www.northyorks.gov.uk/article/25626/Traffic-lights',
-    'default': 'http://www.northyorks.gov.uk/article/28237/Report-it-online'
-};
-
-$(function () {
-    var notice = $('.nycc-notice');
-    $("#problem_form").on("change.category", "select#form_category", function(){
-        var cat = $(this).val();
-        if (cat.search(/NYCC/) > 0) {
-            cat = cat.replace(' (NYCC)', '');
-            var link = links[cat] || links ['default'];
-            notice.find('a').attr({ href: link });
-            notice.show();
-        }
-        else {
-            notice.hide();
-        }
-    });
-});
-
-})();
diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss
deleted file mode 100644
index d3ec521f5..000000000
--- a/web/cobrands/harrogate/layout.scss
+++ /dev/null
@@ -1,118 +0,0 @@
-@import "_colours";
-@import "../sass/layout";
-
-@import "_harrogate_header";
-@import "_harrogate_header_overrides";
-
-body.fullwidthpage, body.twothirdswidthpage, body.authpage, body.frontpage {
-  #main-nav {
-    display: none;
-  }
-  .nav-wrapper .nav-wrapper-2 {
-      height: 0;
-      min-height: 0;
-      border-top: none;
-  }
-  #site-header {
-    height: auto;
-
-    .site-header__tasks__fms-nav {
-      display: block;
-      
-      .container {
-        min-height: 0;
-      }
-      
-      ul {
-        float: none;
-        text-align: center;
-        margin: 1em 0 0;
-        
-        li {
-          display: inline-block;
-          float: none;
-        }
-      }
-    }
-
-    .nav-menu--header {
-      float: none;
-    }
-  }
-
-  .content .sticky-sidebar aside {
-    top: 18em;
-  }
-}
-
-body.mappage {
-  #main-nav {
-    display: block;
-  }
-  #site-header {
-    .site-header__tasks__search-outer, .site-header__toggles, .site-header__right-info,  {
-      display: none;
-    }
-    .site-header__identity__logo a {
-      position: absolute;
-      left: 5px;
-      top: 0;
-      height: 61px;
-      width: 134px;
-    }
-  }
-  .nav-wrapper .nav-wrapper-2 {
-    background-color: transparent;
-  }
-}
-
-#front-main {
-  background: transparent;
-  color: black;
-  
-  #front-main-container {
-    border: 4px solid $harrogate_yellow;
-    padding: 1em;
-  }
-}
-
-footer {
-  padding: 2em 0;
-  font-size: 0.9em;
-
-  .site-footer__heading {
-    display: none;
-  }
-
-  .item-list--inline {
-    border: none;
-    margin: 0;
-    padding: 1em 0;
-
-    .item-list__item {
-      display: inline;
-      list-style: none;
-      background-color: transparent;
-      margin: 0;
-      padding: 0 1.25em 0 0;
-
-      a {
-        color: white;
-        &:hover {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-}
-
-footer .container, #site-header .container {
-  max-width: 1280px;
-  width: 100%;
-}
-
-@media screen and (min-width: 1280px) {
-  footer .container, #site-header .container {
-    width: 1280px;
-  }
-}
-- 
cgit v1.2.3


From 8b08bf14e7b6bd1244713940008569a3a33f3b0e Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 30 Jan 2017 17:26:03 +0000
Subject: Follow redirect to /admin after login if allowed

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

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 825033f21..dac9d3ec7 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -413,7 +413,7 @@ Used after signing in to take the person back to where they were.
 sub redirect_on_signin : Private {
     my ( $self, $c, $redirect ) = @_;
     $redirect = 'my' unless $redirect;
-    $redirect = 'my' if $redirect =~ /^admin/ && !$c->user->is_superuser;
+    $redirect = 'my' if $redirect =~ /^admin/ && !$c->cobrand->admin_allow_user($c->user);
     if ( $c->cobrand->moniker eq 'zurich' ) {
         $redirect = 'admin' if $c->user->from_body;
     }
-- 
cgit v1.2.3


From 4d5dda00af66ce32cbab8dc4d42466cace5e1022 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 30 Jan 2017 17:55:17 +0000
Subject: Redirect to category-filtered /reports on login

If the user has a from_body and at least one category set.
---
 perllib/FixMyStreet/App/Controller/Auth.pm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index dac9d3ec7..b41e88209 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -412,7 +412,10 @@ Used after signing in to take the person back to where they were.
 
 sub redirect_on_signin : Private {
     my ( $self, $c, $redirect ) = @_;
-    $redirect = 'my' unless $redirect;
+    unless ( $redirect ) {
+        $c->detach('redirect_to_categories') if $c->user->from_body && scalar @{ $c->user->categories };
+        $redirect = 'my';
+    }
     $redirect = 'my' if $redirect =~ /^admin/ && !$c->cobrand->admin_allow_user($c->user);
     if ( $c->cobrand->moniker eq 'zurich' ) {
         $redirect = 'admin' if $c->user->from_body;
@@ -420,6 +423,22 @@ sub redirect_on_signin : Private {
     $c->res->redirect( $c->uri_for( "/$redirect" ) );
 }
 
+=head2 redirect_to_categories
+
+Redirects the user to their body's reports page, prefiltered to whatever
+categories this user has been assigned to.
+
+=cut
+
+sub redirect_to_categories : Private {
+    my ( $self, $c ) = @_;
+
+    my $categories = join(',', @{ $c->user->categories });
+    my $body_short = $c->cobrand->short_name( $c->user->from_body );
+
+    $c->res->redirect( $c->uri_for( "/reports/" . $body_short, { filter_category => $categories } ) );
+}
+
 =head2 redirect
 
 Used when trying to view a page that requires sign in when you're not.
-- 
cgit v1.2.3


From b7443da57856dfa6295aad9c2cd3e69065553b70 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 8 Feb 2017 13:19:38 +0000
Subject: Refactor main nav into reusable blocks

---
 templates/web/base/footer.html         | 30 +----------------------
 templates/web/base/main_nav.html       | 35 +++++++++++++++++++++++++++
 templates/web/base/main_nav_items.html | 44 ++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 templates/web/base/main_nav.html
 create mode 100644 templates/web/base/main_nav_items.html

diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 5fd74b3a1..9f86f7519 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -9,35 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--mysoc">
-                        <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
-                    </ul>
-[%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-%]
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/'
-                            %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my'
-                            %]span[% ELSE %]a href="[% base %]/my"[% END
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports'
-                            %]span[% ELSE %]a href="[% base %]/reports[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert'
-                            %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq'
-                            %]span[% ELSE %]a href="[% base %]/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-                            %]span[% ELSE %]a href="[% base %]/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/base/main_nav.html b/templates/web/base/main_nav.html
new file mode 100644
index 000000000..31bd61af5
--- /dev/null
+++ b/templates/web/base/main_nav.html
@@ -0,0 +1,35 @@
+[%
+    SET base = "";
+    SET base = c.cobrand.base_url IF admin;
+
+    # DEFAULT would make sense here, except it treats the empty string as falsy
+    # and some cobrands want to set ul_class to an empty string.
+    SET ul_class="nav-menu nav-menu--main" UNLESS ul_class.defined;
+%]
+[% BLOCK navitem ~%]
+    <li [% liattrs %]>
+      [%~ IF c.req.uri.path == uri ~%]
+          <span [% attrs %]>[% label %]</span>
+      [%~ ELSE ~%]
+          <a href="[% base %][% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a>
+      [%~ END ~%]
+    </li>
+[%~ END %]
+
+[% UNLESS omit_wrapper %]
+    <div id="main-nav" role="navigation">
+[% END %]
+
+    [% UNLESS hide_mysoc_link %]
+        <ul class="nav-menu nav-menu--mysoc">
+            <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
+        </ul>
+    [% END %]
+
+    <ul class="[% ul_class %]"[% " id='" _ ul_id _ "'" IF ul_id %]>
+        [% INCLUDE 'main_nav_items.html' %]
+    </ul>
+
+[% UNLESS omit_wrapper %]
+    </div>
+[% END %]
diff --git a/templates/web/base/main_nav_items.html b/templates/web/base/main_nav_items.html
new file mode 100644
index 000000000..ca82b6560
--- /dev/null
+++ b/templates/web/base/main_nav_items.html
@@ -0,0 +1,44 @@
+[%~ INCLUDE navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
+
+[%~ IF c.user_exists ~%]
+    [%~ INCLUDE navitem uri='/my' label=loc('Your account') ~%]
+[%~ ELSE ~%]
+    [%~ INCLUDE navitem uri='/auth' label=loc('Sign in') ~%]
+[%~ END ~%]
+
+[%~ IF c.user_exists AND c.user.has_body_permission_to('planned_reports') ~%]
+    [%~ INCLUDE navitem uri='/my/planned' label=loc('Shortlist') ~%]
+[%~ END ~%]
+
+
+[%~ UNLESS hide_all_reports_link ~%]
+  [%~
+    IF c.user_exists AND c.user.categories.size;
+      categories = c.user.categories.join(",") | uri;
+      cat_suffix = "?filter_category=" _ categories;
+    END;
+
+    reports_uri = '/reports';
+    IF body_name;
+       body_name = body_name | uri;
+       reports_uri = "${reports_uri}/${body_name}";
+    END;
+
+    INCLUDE navitem uri=reports_uri label=loc('All reports') suffix=cat_suffix;
+  ~%]
+[%~ END ~%]
+
+[%~
+  IF pc;
+    pc_uri = pc | uri;
+    pc_suffix = "/list?pc=" _ pc_uri;
+  END;
+
+  INCLUDE navitem uri='/alert' label=loc('Local alerts') suffix=pc_suffix;
+~%]
+
+[%~ INCLUDE navitem uri='/faq' label=loc('Help') ~%]
+
+[%~ UNLESS hide_privacy_link ~%]
+  [%~ INCLUDE navitem uri='/privacy' label=loc('Privacy') liattrs='class="nav-menu__item--privacy"' ~%]
+[%~ END ~%]
-- 
cgit v1.2.3


From e9660b7b73e041c536ce47f015d55362c65b164a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 8 Feb 2017 17:34:24 +0000
Subject: [UK Councils] Use new main_nav.html for main menu

---
 templates/web/angus/footer.html            |  4 +---
 templates/web/angus/main_menu.html         | 24 ------------------------
 templates/web/angus/post_header_extra.html |  2 +-
 templates/web/bristol/footer.html          | 23 +----------------------
 templates/web/bromley/footer.html          | 15 +--------------
 templates/web/eastherts/footer.html        | 27 +--------------------------
 templates/web/greenwich/footer.html        | 17 +----------------
 templates/web/greenwich/header_logo.html   | 13 +------------
 templates/web/hart/footer.html             | 13 +------------
 templates/web/oxfordshire/footer.html      | 16 +---------------
 templates/web/oxfordshire/header.html      | 28 +---------------------------
 templates/web/stevenage/footer.html        | 15 +--------------
 templates/web/warwickshire/header.html     | 20 +-------------------
 web/cobrands/bromley/layout.scss           | 18 ++++++++++++++++++
 14 files changed, 30 insertions(+), 205 deletions(-)
 delete mode 100644 templates/web/angus/main_menu.html

diff --git a/templates/web/angus/footer.html b/templates/web/angus/footer.html
index 9a7e1dd6d..ec91aaa71 100644
--- a/templates/web/angus/footer.html
+++ b/templates/web/angus/footer.html
@@ -4,9 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--main' %]
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/angus/main_menu.html b/templates/web/angus/main_menu.html
deleted file mode 100644
index 3a07c61cd..000000000
--- a/templates/web/angus/main_menu.html
+++ /dev/null
@@ -1,24 +0,0 @@
-[%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-%]
-<ul class="nav-menu [% extra_class %]">
-    <li><[% IF c.req.uri.path == '/'
-        %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
-        >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/my'
-        %]span[% ELSE %]a href="[% base %]/my"[% END
-        %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/reports/Angus'
-        %]span[% ELSE %]a href="[% base %]/reports/Angus"[% END
-        %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Angus' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/alert'
-        %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-        %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-    %]<li><[% IF c.req.uri.path == '/faq'
-        %]span[% ELSE %]a href="[% base %]/faq"[% END
-        %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-    %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-        %]span[% ELSE %]a href="[% base %]/privacy"[% END
-        %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-</ul>
diff --git a/templates/web/angus/post_header_extra.html b/templates/web/angus/post_header_extra.html
index 16a82de3e..43ba8af92 100644
--- a/templates/web/angus/post_header_extra.html
+++ b/templates/web/angus/post_header_extra.html
@@ -9,6 +9,6 @@
 
 <div class="wrapper wrapper__main_menu">
   <div class="container">
-    [% INCLUDE 'main_menu.html' extra_class = 'nav-menu--breadcrumb' %]
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="nav-menu nav-menu--breadcrumb" omit_wrapper=1 %]
   </div>
 </div>
diff --git a/templates/web/bristol/footer.html b/templates/web/bristol/footer.html
index c71d7151b..52f2d50df 100644
--- a/templates/web/bristol/footer.html
+++ b/templates/web/bristol/footer.html
@@ -4,28 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/'
-                            %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my'
-                            %]span[% ELSE %]a href="/my"[% END
-                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports/Bristol'
-                            %]span[% ELSE %]a href="/reports/Bristol"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports/Bristol' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert'
-                            %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq'
-                            %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-                            %]span[% ELSE %]a href="/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 37ba0641e..f9b844ce5 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -9,20 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END
-                            %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/eastherts/footer.html b/templates/web/eastherts/footer.html
index b665153bd..fb39c29c2 100644
--- a/templates/web/eastherts/footer.html
+++ b/templates/web/eastherts/footer.html
@@ -4,32 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-[%
-    SET base = "";
-    SET base = c.cobrand.base_url IF admin;
-%]
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/'
-                            %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my'
-                            %]span[% ELSE %]a href="[% base %]/my"[% END
-                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports'
-                            %]span[% ELSE %]a href="[% base %]/reports"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert'
-                            %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq'
-                            %]span[% ELSE %]a href="[% base %]/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
-                            %]span[% ELSE %]a href="[% base %]/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index 494d5b66b..03dbc0330 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -9,22 +9,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]span[% ELSE %]a href="/reports"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html
index d788de6f8..6359eba3b 100644
--- a/templates/web/greenwich/header_logo.html
+++ b/templates/web/greenwich/header_logo.html
@@ -15,15 +15,4 @@
         <li><a href="/">FixMyStreet</a></li>
     </ul>
 
-    <ul id="fms-menu-desktop">
-        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-        %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
-            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-    </ul>
+    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_name hide_mysoc_link=1 hide_privacy_link=1 ul_id="fms-menu-desktop" ul_class="" omit_wrapper=1 %]
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index fae5bed1a..ce0ae3844 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -7,18 +7,7 @@
     <div class="nav-wrapper clearfix">
         <div class="main-menu-wrapper">
             <div class="main-menu">
-            <ul class="clearfix">
-                <li class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                    >[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                %]<li><[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END
-                    %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]></li>[%
-                %]<li><[% IF c.req.uri.path == '/reports/Hart' %]span[% ELSE %]a href="/reports/Hart"[% END
-                    %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                    %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                %]<li class="last"><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                    %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-            </ul>
+              [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 ul_class="clearfix" hide_privacy_link=1 %]
             </div>
         </div>
         <div class="nav-wrapper-2 clearfix">
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index 89a9f89de..5f117cfd3 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -14,21 +14,7 @@
                         <li><a id="mysoc-logo" href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
 
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %][% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') %]<li>
-                            <[% IF c.req.uri.path == '/my/planned' %]span[% ELSE %]a href="/my/planned"[% END
-                             %]>[% loc('Shortlist') %]</[% c.req.uri.path == '/my/planned' ? 'span' : 'a' %]></li>[%
-                        %][% END %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                    </ul>
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 omit_wrapper=1 hide_privacy_link=1 %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index d8cb8d4bb..452a71e88 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -37,33 +37,7 @@
         <div id="navigation">
             <div class="menubar">
                 <div class="menu-inner">
-                    <ul class="menu">
-                        <li>
-                            <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]>
-                        </li>
-                        <li>
-                            <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END
-                             %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]>
-                        </li>
-                        [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') %]
-                        <li>
-                            <[% IF c.req.uri.path == '/my/planned' %]span[% ELSE %]a href="/my/planned"[% END
-                             %]>[% loc('Shortlist') %]</[% c.req.uri.path == '/my/planned' ? 'span' : 'a' %]>
-                        </li>
-                        [% END %]
-                        <li>
-                            <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
-                                 %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]>
-                        </li>
-                        <li>
-                            <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                                 %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]>
-                        </li>
-                        <li>
-                            <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                                 %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]>
-                        </li>
-                    </ul>
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 omit_wrapper=1 ul_class="menu" %]
                 </div>
             </div>
         </div>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index e251a83c2..215ca0eab 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -89,20 +89,7 @@
 
 
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                            %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/reports/Stevenage' %]span[% ELSE %]a href="/reports/Stevenage"[% END
-                            %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_privacy_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 3c74b6d0e..da56719eb 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -172,25 +172,7 @@
         <div class="container navbar-container">
             <div class="navbar" id="mega-menu-navbar">
                 <div class="navbar-inner">
-                    <ul id="mega-menu" class="menu nav">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
-                            %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
-                            %]
-                            <!--
-                            <li><[% IF c.req.uri.path == '/reports/Warwickshire' %]span[% ELSE %]a href="/reports/Warwickshire"[% END %]>
-                            [% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]>
-                            </li>
-                            -->
-                            
-                            <li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
-                            %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
-                        %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END
-                            %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
-                    </ul>
+                    [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 hide_all_reports_link=1 omit_wrapper=1 ul_class="menu nav" ul_id="mega-menu" %]
                 </div>
             </div>
         </div>
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 71d7cbc47..2e23d1755 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -23,6 +23,12 @@ body.mappage {
   #site-header {
     height: 5em;
   }
+
+  // Make the report button match the rest of the nav
+  .nav-menu--main a.report-a-problem-btn {
+      padding: 1.4em 0.75em 1.35em;
+      margin: 0;
+  }
 }
 
 // We have to specify this again for IE, since FMS overrides it
@@ -49,6 +55,18 @@ body.mappage {
 // Override the FMS main menu to give it a background colour
 .nav-menu--main {
   background-color: $bromley_blue;
+
+  // Bromley doesn't have a special styling for the report button in the nav
+  a.report-a-problem-btn {
+    color: $nav_fg;
+    background: none;
+    padding: 0.75em;
+    margin: 0;
+    @include border-radius(0);
+    &:hover {
+      background: $nav_fg_hover;
+    }
+  }
 }
 .nav-menu--main span {
   color: $nav_fg;
-- 
cgit v1.2.3


From 009cc2584a3111ab862a0a6335d6e00df1e08bbf Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 8 Feb 2017 18:38:25 +0000
Subject: [SeeSomething] Use new main_nav.html for main menu

---
 templates/web/seesomething/footer.html         | 10 +---------
 templates/web/seesomething/main_nav_items.html |  3 +++
 2 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 templates/web/seesomething/main_nav_items.html

diff --git a/templates/web/seesomething/footer.html b/templates/web/seesomething/footer.html
index 555a01010..6fd0f42b2 100644
--- a/templates/web/seesomething/footer.html
+++ b/templates/web/seesomething/footer.html
@@ -4,15 +4,7 @@
 
         <div class="nav-wrapper">
             <div class="nav-wrapper-2">
-                <div id="main-nav" role="navigation">
-
-                    <ul class="nav-menu nav-menu--main">
-                        <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
-                            >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
-                        %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
-                            %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                    </ul>
-                </div>
+                [% INCLUDE "main_nav.html" hide_mysoc_link=1 %]
             </div>
         </div>
     </div> <!-- .wrapper -->
diff --git a/templates/web/seesomething/main_nav_items.html b/templates/web/seesomething/main_nav_items.html
new file mode 100644
index 000000000..0bfb9576a
--- /dev/null
+++ b/templates/web/seesomething/main_nav_items.html
@@ -0,0 +1,3 @@
+[%~ PROCESS navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
+
+[%~ PROCESS navitem uri='/faq' label=loc('Help') ~%]
-- 
cgit v1.2.3


From 0b1ab9fb1145ca32dced46b4faefe49da5c76768 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Fri, 20 Jan 2017 14:46:01 +0000
Subject: Utils::prettify_duration improvements

 - Add year and month to $nearest options
 - Allow prettify_duration to choose a sensible $nearest if omitted
---
 perllib/Utils.pm | 33 ++++++++++++++++++++++++++++++---
 t/utils.t        |  8 ++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index 7dd2a3f39..6ba20e9d3 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -99,7 +99,7 @@ sub truncate_coordinate {
 Strip leading and trailing white space from a string. Also reduces all
 white space to a single space.
 
-Trim 
+Trim
 
 =cut
 
@@ -195,7 +195,28 @@ sub prettify_dt {
 # argument is duration in seconds, rounds to the nearest minute
 sub prettify_duration {
     my ($s, $nearest) = @_;
-    if ($nearest eq 'week') {
+
+    unless ( defined $nearest ) {
+        if ($s < 3600) {
+            $nearest = 'minute';
+        } elsif ($s < 3600*24) {
+            $nearest = 'hour';
+        } elsif ($s < 3600*24*7) {
+            $nearest = 'day';
+        } elsif ($s < 3600*24*7*4) {
+            $nearest = 'week';
+        } elsif ($s < 3600*24*7*4*12) {
+            $nearest = 'month';
+        } else {
+            $nearest = 'year';
+        }
+    }
+
+    if ($nearest eq 'year') {
+        $s = int(($s+60*60*24*3.5)/60/60/24/7/4/12)*60*60*24*7*4*12;
+    } elsif ($nearest eq 'month') {
+        $s = int(($s+60*60*24*3.5)/60/60/24/7/4)*60*60*24*7*4;
+    } elsif ($nearest eq 'week') {
         $s = int(($s+60*60*24*3.5)/60/60/24/7)*60*60*24*7;
     } elsif ($nearest eq 'day') {
         $s = int(($s+60*60*12)/60/60/24)*60*60*24;
@@ -206,6 +227,8 @@ sub prettify_duration {
         return _('less than a minute') if $s == 0;
     }
     my @out = ();
+    _part(\$s, 60*60*24*7*4*12, \@out);
+    _part(\$s, 60*60*24*7*4, \@out);
     _part(\$s, 60*60*24*7, \@out);
     _part(\$s, 60*60*24, \@out);
     _part(\$s, 60*60, \@out);
@@ -217,7 +240,11 @@ sub _part {
     if ($$s >= $m) {
         my $i = int($$s / $m);
         my $str;
-        if ($m == 60*60*24*7) {
+        if ($m == 60*60*24*7*4*12) {
+            $str = mySociety::Locale::nget("%d year", "%d years", $i);
+        } elsif ($m == 60*60*24*7*4) {
+            $str = mySociety::Locale::nget("%d month", "%d months", $i);
+        } elsif ($m == 60*60*24*7) {
             $str = mySociety::Locale::nget("%d week", "%d weeks", $i);
         } elsif ($m == 60*60*24) {
             $str = mySociety::Locale::nget("%d day", "%d days", $i);
diff --git a/t/utils.t b/t/utils.t
index d6c56d95a..f989580c8 100644
--- a/t/utils.t
+++ b/t/utils.t
@@ -91,10 +91,18 @@ is Utils::prettify_dt($dt, 1), $dt->strftime("%H:%M, %e %b %Y");
 $dt = DateTime->now->subtract(days => 400);
 is Utils::prettify_dt($dt), $dt->strftime("%H:%M, %a %e %B %Y");
 
+is Utils::prettify_duration(12*5*7*86400+3600+60+1, 'year'), '1 year';
+is Utils::prettify_duration(25*5*7*86400+3600+60+1, 'year'), '2 years';
+is Utils::prettify_duration(5*7*86400+3600+60+1, 'month'), '1 month';
 is Utils::prettify_duration(7*86400+3600+60+1, 'week'), '1 week';
 is Utils::prettify_duration(86400+3600+60+1, 'day'), '1 day';
 is Utils::prettify_duration(86400+3600+60+1, 'hour'), '1 day, 1 hour';
 is Utils::prettify_duration(86400+3600+60+1, 'minute'), '1 day, 1 hour, 1 minute';
 is Utils::prettify_duration(20, 'minute'), 'less than a minute';
+# prettify_duration should choose a $nearest sensibly if it's not given
+is Utils::prettify_duration(12*5*7*86400+3600+60+1), '1 year';
+is Utils::prettify_duration(7*86400+3600+60+1), '1 week';
+is Utils::prettify_duration(14*86400+3600+60+1), '2 weeks';
+is Utils::prettify_duration(1800), '30 minutes';
 
 done_testing();
-- 
cgit v1.2.3


From b14319e75b61ce1ee21ebb7d6fa924ebe18ceee9 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Tue, 17 Jan 2017 16:44:50 +0000
Subject: Add Problem->time_ago for pretty-printed duration

---
 perllib/FixMyStreet/DB/Result/Problem.pm | 14 ++++++++++
 t/app/model/problem.t                    | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 0092dd8b5..d0a5a3a4f 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -659,6 +659,20 @@ sub body {
     return $body;
 }
 
+
+=head2 time_ago
+  Returns how long ago a problem was reported in an appropriately
+  prettified duration, depending on the duration.
+=cut
+
+sub time_ago {
+    my ( $self, $date ) = @_;
+    $date ||= 'confirmed';
+    my $duration = time() - $self->$date->epoch;
+
+    return Utils::prettify_duration( $duration );
+}
+
 =head2 response_templates
 
 Returns all ResponseTemplates attached to this problem's bodies, in alphabetical
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 1130078c0..e2c407ffb 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -774,6 +774,50 @@ subtest 'check duplicate reports' => sub {
     is $problem2->duplicates->[0]->title, $problem1->title, 'problem2 includes problem1 in duplicates';
 };
 
+subtest 'get report time ago in appropriate format' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( minutes => 2)
+    } );
+    is $problem->time_ago, '2 minutes', 'problem returns time ago in minutes';
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( hours => 18)
+    } );
+    is $problem->time_ago, '18 hours', 'problem returns time ago in hours';
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( days => 4)
+    } );
+    is $problem->time_ago, '4 days', 'problem returns time ago in days';
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( weeks => 3 )
+    } );
+    is $problem->time_ago, '3 weeks', 'problem returns time ago in weeks';
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( months => 4 )
+    } );
+    is $problem->time_ago, '4 months', 'problem returns time ago in months';
+
+    $problem->update( {
+      confirmed => DateTime->now->subtract( years => 2 )
+    } );
+    is $problem->time_ago, '2 years', 'problem returns time ago in years';
+
+};
+
+subtest 'time ago works with other dates' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
+
+    $problem->update( {
+      lastupdate => DateTime->now->subtract( days => 4)
+    } );
+    is $problem->time_ago('lastupdate'), '4 days', 'problem returns last updated time ago in days';
+};
+
 END {
     $problem->comments->delete if $problem;
     $problem->delete if $problem;
-- 
cgit v1.2.3


From 2a099bc9b33ed0b40234a7070437f4defb44ce4b Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 18 Jan 2017 11:20:37 +0000
Subject: Allow users to reopen closed reports

Users can reopen their own reports when leaving an update.
---
 templates/web/base/report/update/form_update.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html
index e0464eec3..f15a1f74b 100644
--- a/templates/web/base/report/update/form_update.html
+++ b/templates/web/base/report/update/form_update.html
@@ -47,10 +47,14 @@
     [% END %]
     </select>
 [% ELSE %]
-  [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %]
+  [% IF (problem.is_fixed OR problem.state == 'closed') AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %]
 
-    <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]>
-    <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label>
+    <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>
+    [% ELSE %]
+      <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label>
+    [% END %]
 
   [% ELSIF !problem.is_fixed %]
 
-- 
cgit v1.2.3


From 3010d13823de9833700b18bf4ac3e71437d9001f Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 18 Jan 2017 14:44:04 +0000
Subject: Add Problem->tokenised_url for logging user in

This method creates a token that logs the reporting user in, optionally
with some parameters which are stored with the token for use when redirecting
after login.
---
 perllib/FixMyStreet/DB/Result/Problem.pm | 26 ++++++++++++++++++++++++++
 t/app/model/problem.t                    | 31 +++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index d0a5a3a4f..97cb28fe8 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -182,6 +182,8 @@ use Utils;
 use FixMyStreet::Map::FMS;
 use LWP::Simple qw($ua);
 use RABX;
+use URI;
+use URI::QueryParam;
 
 my $IM = eval {
     require Image::Magick;
@@ -511,6 +513,30 @@ sub admin_url {
     return $cobrand->admin_base_url . '/report_edit/' . $self->id;
 }
 
+=head2 tokenised_url
+
+Return a url for this problem report that logs a user in
+
+=cut
+
+sub tokenised_url {
+    my ($self, $user, $params) = @_;
+
+    my $token = FixMyStreet::App->model('DB::Token')->create(
+        {
+            scope => 'email_sign_in',
+            data  => {
+                id    => $self->id,
+                email => $user->email,
+                r     => $self->url,
+                p     => $params,
+            }
+        }
+    );
+
+    return "/M/". $token->token;
+}
+
 =head2 is_open
 
 Returns 1 if the problem is in a open state otherwise 0.
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index e2c407ffb..52213ed51 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -5,6 +5,7 @@ use Test::More;
 
 use FixMyStreet::TestMech;
 use FixMyStreet;
+use FixMyStreet::App;
 use FixMyStreet::DB;
 use mySociety::Locale;
 use Sub::Override;
@@ -53,7 +54,7 @@ is $problem->whensent,   undef, 'inflating null confirmed ok';
 is $problem->lastupdate, undef, 'inflating null confirmed ok';
 is $problem->created,  undef, 'inflating null confirmed ok';
 
-for my $test ( 
+for my $test (
     {
         desc => 'more or less empty problem',
         changed => {},
@@ -242,7 +243,7 @@ for my $test (
     };
 }
 
-for my $test ( 
+for my $test (
     {
         state => 'partial',
         is_visible  => 0,
@@ -774,6 +775,32 @@ subtest 'check duplicate reports' => sub {
     is $problem2->duplicates->[0]->title, $problem1->title, 'problem2 includes problem1 in duplicates';
 };
 
+subtest 'generates a tokenised url for a user' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
+    my $url = $problem->tokenised_url($user);
+    (my $token = $url) =~ s/\/M\///g;
+
+    like $url, qr/\/M\//, 'problem generates tokenised url';
+
+    my $token_obj = FixMyStreet::App->model('DB::Token')->find( {
+        scope => 'email_sign_in', token => $token
+    } );
+    is $token, $token_obj->token, 'token is generated in database with correct scope';
+    is $token_obj->data->{r}, $problem->url, 'token has correct redirect data';
+};
+
+subtest 'stores params in a token' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
+    my $url = $problem->tokenised_url($user, { foo => 'bar', baz => 'boo'});
+    (my $token = $url) =~ s/\/M\///g;
+
+    my $token_obj = FixMyStreet::App->model('DB::Token')->find( {
+        scope => 'email_sign_in', token => $token
+    } );
+
+    is_deeply $token_obj->data->{p}, { foo => 'bar', baz => 'boo'}, 'token has correct params';
+};
+
 subtest 'get report time ago in appropriate format' => sub {
     my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
 
-- 
cgit v1.2.3


From 9efe4d14d1415e2fa060891b8be8ffec8b237911 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 18 Jan 2017 16:24:45 +0000
Subject: Use Token params for redirect on login

Tokens can include a 'p' field in their data to set query params for the
post-login redirect URL.
---
 perllib/FixMyStreet/App/Controller/Auth.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index b41e88209..70821f79d 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -223,7 +223,7 @@ sub token : Path('/M') : Args(1) {
     $c->authenticate( { email => $user->email }, 'no_password' );
 
     # send the user to their page
-    $c->detach( 'redirect_on_signin', [ $data->{r} ] );
+    $c->detach( 'redirect_on_signin', [ $data->{r}, $data->{p} ] );
 }
 
 =head2 facebook_sign_in
@@ -411,7 +411,7 @@ Used after signing in to take the person back to where they were.
 
 
 sub redirect_on_signin : Private {
-    my ( $self, $c, $redirect ) = @_;
+    my ( $self, $c, $redirect, $params ) = @_;
     unless ( $redirect ) {
         $c->detach('redirect_to_categories') if $c->user->from_body && scalar @{ $c->user->categories };
         $redirect = 'my';
@@ -420,7 +420,11 @@ sub redirect_on_signin : Private {
     if ( $c->cobrand->moniker eq 'zurich' ) {
         $redirect = 'admin' if $c->user->from_body;
     }
-    $c->res->redirect( $c->uri_for( "/$redirect" ) );
+    if (defined $params) {
+        $c->res->redirect( $c->uri_for( "/$redirect", $params ) );
+    } else {
+        $c->res->redirect( $c->uri_for( "/$redirect" ) );
+    }
 }
 
 =head2 redirect_to_categories
-- 
cgit v1.2.3


From 8e6f6a1818b4f998d48f157387d2314bb8c86f8a Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 18 Jan 2017 17:05:10 +0000
Subject: [Oxfordshire] Old report archiving script

This script can be used for the bulk closure of old reports that haven't been
updated in a long time.

Reports that haven't been updated in a *really* long time (since 2014, by
default) are simply closed, and those that haven't been updated since 2015 (by
default) are closed and an email explaining the closure is sent to the report
creator.

This script can be used for other cobrands, but they'll need an
archive.{txt,html} template in order for the emails to be sent.

For mysociety/fixmystreetforcouncils#51
---
 bin/oxfordshire/archive-old-enquiries             |  29 ++++
 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm | 141 +++++++++++++++++++
 t/app/script/archive_old_enquiries.t              | 163 ++++++++++++++++++++++
 templates/email/oxfordshire/archive.html          |  58 ++++++++
 templates/email/oxfordshire/archive.txt           |  28 ++++
 5 files changed, 419 insertions(+)
 create mode 100755 bin/oxfordshire/archive-old-enquiries
 create mode 100644 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
 create mode 100644 t/app/script/archive_old_enquiries.t
 create mode 100644 templates/email/oxfordshire/archive.html
 create mode 100644 templates/email/oxfordshire/archive.txt

diff --git a/bin/oxfordshire/archive-old-enquiries b/bin/oxfordshire/archive-old-enquiries
new file mode 100755
index 000000000..7fe66703a
--- /dev/null
+++ b/bin/oxfordshire/archive-old-enquiries
@@ -0,0 +1,29 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+require 5.8.0;
+
+BEGIN {
+    use File::Basename qw(dirname);
+    use File::Spec;
+    my $d = dirname(File::Spec->rel2abs($0));
+    require "$d/../../setenv.pl";
+}
+
+use FixMyStreet::Script::ArchiveOldEnquiries;
+use Getopt::Long::Descriptive;
+
+my ($opts, $usage) = describe_options(
+    '%c %o',
+    ['commit|c',     "actually close reports and send emails. Omitting this flag will do a dry-run"],
+    ['body|b=s',     "which body ID to close reports for"],
+    ['cobrand=s',     "which cobrand template to use for sent emails"],
+    ['closure-cutoff=s',     "Anything before this will be closed with no email"],
+    ['email-cutoff=s',     "Anything before this will be closed with an email sent to the reporter"],
+    ['limit|l=s',     "limit to a certain number of reports/users to be closed"],
+    ['help|h',       "print usage message and exit" ],
+);
+print($usage->text), exit if $opts->help;
+
+FixMyStreet::Script::ArchiveOldEnquiries::archive($opts);
diff --git a/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
new file mode 100644
index 000000000..5d1d45379
--- /dev/null
+++ b/perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm
@@ -0,0 +1,141 @@
+package FixMyStreet::Script::ArchiveOldEnquiries;
+
+use strict;
+use warnings;
+require 5.8.0;
+
+use FixMyStreet;
+use FixMyStreet::App;
+use FixMyStreet::DB;
+use FixMyStreet::Cobrand;
+use FixMyStreet::Map;
+use FixMyStreet::Email;
+
+
+my $opts = {
+    commit => 0,
+    body => '2237',
+    cobrand => 'oxfordshire',
+    closure_cutoff => "2015-01-01 00:00:00",
+    email_cutoff => "2016-01-01 00:00:00",
+};
+
+sub query {
+    return {
+        bodies_str => { 'LIKE', "%".$opts->{body}."%"},
+        -and       => [
+          lastupdate => { '<', $opts->{email_cutoff} },
+          lastupdate => { '>', $opts->{closure_cutoff} },
+        ],
+        state      => [ FixMyStreet::DB::Result::Problem->open_states() ],
+    };
+}
+
+sub archive {
+    my $params = shift;
+    if ( $params ) {
+        $opts = {
+            %$opts,
+            %$params,
+        };
+    }
+
+    unless ( $opts->{commit} ) {
+        printf "Doing a dry run; emails won't be sent and reports won't be closed.\n";
+        printf "Re-run with --commit to actually archive reports.\n\n";
+    }
+
+    my @user_ids = FixMyStreet::DB->resultset('Problem')->search(query(),
+    {
+        distinct => 1,
+        columns  => ['user_id'],
+        rows => $opts->{limit},
+    })->all;
+
+    @user_ids = map { $_->user_id } @user_ids;
+
+    my $users = FixMyStreet::DB->resultset('User')->search({
+        id => \@user_ids
+    });
+
+    my $user_count = $users->count;
+    my $problem_count = FixMyStreet::DB->resultset('Problem')->search(query(),
+    {
+        columns  => ['id'],
+        rows => $opts->{limit},
+    })->count;
+
+    printf("%d users will receive closure emails about %d reports which will be closed.\n", $user_count, $problem_count);
+
+    if ( $opts->{commit} ) {
+        my $i = 0;
+        while ( my $user = $users->next ) {
+            printf("%d/%d: User ID %d\n", ++$i, $user_count, $user->id);
+            send_email_and_close($user);
+        }
+    }
+
+    my $problems_to_close = FixMyStreet::DB->resultset('Problem')->search({
+        bodies_str => { 'LIKE', "%".$opts->{body}."%"},
+        lastupdate => { '<', $opts->{closure_cutoff} },
+        state      => [ FixMyStreet::DB::Result::Problem->open_states() ],
+    }, {
+        rows => $opts->{limit},
+    });
+
+    printf("Closing %d old reports, without sending emails: ", $problems_to_close->count);
+
+    if ( $opts->{commit} ) {
+        $problems_to_close->update({ state => 'closed', send_questionnaire => 0 });
+    }
+
+    printf("done.\n")
+}
+
+sub send_email_and_close {
+    my ($user) = @_;
+
+    my $problems = $user->problems->search(query(), {
+        order_by => { -desc => 'confirmed' },
+    });
+
+    my @problems = $problems->all;
+
+    return if scalar(@problems) == 0;
+
+    my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker($opts->{cobrand})->new();
+    $cobrand->set_lang_and_domain($problems[0]->lang, 1);
+    FixMyStreet::Map::set_map_class($cobrand->map_type);
+
+    my %h = (
+      reports => [@problems],
+      report_count => scalar(@problems),
+      site_name => $cobrand->moniker,
+      user => $user,
+      cobrand => $cobrand,
+    );
+
+    # Send email
+    printf("    Sending email about %d reports: ", scalar(@problems));
+    my $email_error = FixMyStreet::Email::send_cron(
+        $problems->result_source->schema,
+        'archive.txt',
+        \%h,
+        {
+            To => [ [ $user->email, $user->name ] ],
+        },
+        undef,
+        undef,
+        $cobrand,
+        $problems[0]->lang,
+    );
+
+    unless ( $email_error ) {
+        printf("done.\n    Closing reports: ");
+
+        $problems->update({ state => 'closed', send_questionnaire => 0 });
+        printf("done.\n");
+    } else {
+        printf("error! Not closing reports for this user.\n")
+    }
+}
diff --git a/t/app/script/archive_old_enquiries.t b/t/app/script/archive_old_enquiries.t
new file mode 100644
index 000000000..e87d6a0f8
--- /dev/null
+++ b/t/app/script/archive_old_enquiries.t
@@ -0,0 +1,163 @@
+use strict;
+use warnings;
+use Test::More;
+use FixMyStreet::TestMech;
+use FixMyStreet::Script::ArchiveOldEnquiries;
+
+mySociety::Locale::gettext_domain( 'FixMyStreet' );
+
+my $mech = FixMyStreet::TestMech->new();
+
+$mech->clear_emails_ok;
+
+my $opts = {
+    commit => 1,
+};
+
+my $user = $mech->create_user_ok('test@example.com', name => 'Test User');
+my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council', id => 2237);
+my $west_oxon = $mech->create_body_ok(2420, 'West Oxfordshire District Council', id => 2420);
+
+subtest 'sets reports to the correct status' => sub {
+    FixMyStreet::override_config {
+          ALLOWED_COBRANDS => [ 'oxfordshire' ],
+    }, sub {
+        my ($report) = $mech->create_problems_for_body(1, $oxfordshire->id, 'Test', {
+            areas      => ',2237,',
+            user_id    => $user->id,
+        });
+
+        my ($report1) = $mech->create_problems_for_body(1, $oxfordshire->id . "," .$west_oxon->id, 'Test', {
+            areas      => ',2237,',
+            lastupdate => '2015-12-01 07:00:00',
+            user       => $user,
+        });
+
+        my ($report2) = $mech->create_problems_for_body(1, $oxfordshire->id, 'Test 2', {
+            areas      => ',2237,',
+            lastupdate => '2015-12-01 08:00:00',
+            user       => $user,
+            state      => 'investigating',
+        });
+
+        my ($report3, $report4) = $mech->create_problems_for_body(2, $oxfordshire->id, 'Test', {
+            areas      => ',2237,',
+            lastupdate => '2014-12-01 07:00:00',
+            user       => $user,
+        });
+
+        my ($report5) = $mech->create_problems_for_body(1, $oxfordshire->id . "," .$west_oxon->id, 'Test', {
+            areas      => ',2237,',
+            lastupdate => '2014-12-01 07:00:00',
+            user       => $user,
+            state      => 'in progress'
+        });
+
+        FixMyStreet::Script::ArchiveOldEnquiries::archive($opts);
+
+        $report->discard_changes;
+        $report1->discard_changes;
+        $report2->discard_changes;
+        $report3->discard_changes;
+        $report4->discard_changes;
+        $report5->discard_changes;
+
+        is $report1->state, 'closed', 'Report 1 has been set to closed';
+        is $report2->state, 'closed', 'Report 2 has been set to closed';
+        is $report3->state, 'closed', 'Report 3 has been set to closed';
+        is $report4->state, 'closed', 'Report 4 has been set to closed';
+        is $report5->state, 'closed', 'Report 5 has been set to closed';
+
+        is $report->state, 'confirmed', 'Recent report has been left alone';
+    };
+};
+
+subtest 'sends emails to a user' => sub {
+    FixMyStreet::override_config {
+      ALLOWED_COBRANDS => [ 'oxfordshire' ],
+    }, sub {
+        $mech->clear_emails_ok;
+        $mech->email_count_is(0);
+
+        $mech->create_problems_for_body(1, $oxfordshire->id, 'Shiny new report', {
+            areas      => ',2237,',
+            user       => $user,
+        });
+
+        $mech->create_problems_for_body(1, $oxfordshire->id, 'Problem the first', {
+            areas      => ',2237,',
+            lastupdate => '2015-12-01 07:00:00',
+            user       => $user,
+        });
+
+        $mech->create_problems_for_body(1, $oxfordshire->id, 'Problem the second', {
+            areas      => ',2237,',
+            lastupdate => '2015-12-01 07:00:00',
+            user       => $user,
+        });
+
+        $mech->create_problems_for_body(1, $oxfordshire->id, 'Problem the third', {
+            areas      => ',2237,',
+            lastupdate => '2015-12-01 07:00:00',
+            user       => $user,
+        });
+
+        $mech->create_problems_for_body(1, $oxfordshire->id, 'Really old report', {
+            areas      => ',2237,',
+            lastupdate => '2014-12-01 07:00:00',
+            user       => $user,
+        });
+
+        FixMyStreet::Script::ArchiveOldEnquiries::archive($opts);
+
+        my @emails = $mech->get_email;
+        $mech->email_count_is(1);
+
+        my $email = $emails[0];
+        my $body = $mech->get_text_body_from_email($email);
+
+        like $body, qr/Problem the first/, 'Email body matches report name';
+        like $body, qr/Problem the second/, 'Email body matches report name';
+        like $body, qr/Problem the third/, 'Email body matches report name';
+
+        unlike  $body, qr/Shiny new report/, 'Email body does not have new report';
+        unlike  $body, qr/Really old report/, 'Email body does not have old report';
+    };
+};
+
+subtest 'user with old reports does not get email' => sub {
+  $mech->clear_emails_ok;
+  $mech->email_count_is(0);
+
+  $mech->create_problems_for_body(4, $oxfordshire->id, 'Really old report', {
+      areas      => ',2237,',
+      lastupdate => '2014-12-01 07:00:00',
+      user       => $user,
+  });
+
+  FixMyStreet::Script::ArchiveOldEnquiries::archive($opts);
+
+  my @emails = $mech->get_email;
+  $mech->email_count_is(0);
+};
+
+subtest 'user with new reports does not get email' => sub {
+  $mech->clear_emails_ok;
+  $mech->email_count_is(0);
+
+  $mech->create_problems_for_body(4, $oxfordshire->id, 'Shiny new report', {
+      areas      => ',2237,',
+      user       => $user,
+  });
+
+  FixMyStreet::Script::ArchiveOldEnquiries::archive($opts);
+
+  $mech->email_count_is(0);
+};
+
+done_testing();
+
+END {
+    $mech->delete_user($user);
+    $mech->delete_body($oxfordshire);
+}
diff --git a/templates/email/oxfordshire/archive.html b/templates/email/oxfordshire/archive.html
new file mode 100644
index 000000000..ed48456a2
--- /dev/null
+++ b/templates/email/oxfordshire/archive.html
@@ -0,0 +1,58 @@
+[%
+
+email_summary = "Your reports on " _ site_name;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Your [% site_name %] reports on FixMyStreet</h1>
+  <p style="[% p_style %]">
+    Hello [% user.name %],
+  </p>
+  <p style="[% p_style %]">
+    FixMyStreet is being updated in Oxfordshire to
+    improve how problems get fixed.
+  </p>
+  <p style="[% p_style %]">
+    As part of these updates, we are closing old reports that appear to be
+    resolved but remain open in the system.
+  </p>
+  <p style="[% p_style %]">
+    We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system,
+    which we've listed below.
+  </p>
+  <p style="[% p_style %]">
+    If your report is no longer an issue, you don't need to do anything.
+  </p>
+  <p style="[% p_style %]">
+    If you believe that your report is still a problem, you can reopen it by
+    clicking the 'reopen' button by a report.
+  </p>
+
+  [% FOR report IN reports %]
+  <div style="[% list_item_style %]">
+  [% IF report.photo %]
+    <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]">
+      <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt="">
+    </a>
+  [% END %]
+    <h2 style="[% list_item_h2_style %]">
+      [%~ report.title | html ~%]
+    </h2>
+    <p style="[% list_item_p_style %]">[% report.detail | html %]</p>
+    <p style="[% list_item_date_style %]">
+      Reported [% report.time_ago %] ago.
+    </p>
+    <p>
+      <a style="[% button_style %]" href="[% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form">Reopen report</a>
+    </p>
+  </div>
+  [% END %]
+
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/oxfordshire/archive.txt b/templates/email/oxfordshire/archive.txt
new file mode 100644
index 000000000..6ecf5b02f
--- /dev/null
+++ b/templates/email/oxfordshire/archive.txt
@@ -0,0 +1,28 @@
+Subject: Your reports on [% site_name %]
+
+Hello [% user.name %],
+
+FixMyStreet is being updated in Oxfordshire to improve how problems get fixed.
+
+As part of these updates, we are closing old reports that appear to be resolved but remain open in the system.
+
+We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below.
+
+If your report is no longer an issue, you don't need to do anything.
+
+If you believe that your report is still a problem, you can reopen it by clicking or copying and pasting
+the link marked 'Reopen?' by a report.
+
+[% FOR report IN reports %]
+
+[% report.title %]
+
+Reported [% report.time_ago %] ago.
+
+Reopen? [% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form
+
+----
+
+[% END %]
+
+The mySociety team and Oxfordshire County Council
-- 
cgit v1.2.3


From 34795d026faf45b0a1bfc103362eb118766c46d7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 22 Sep 2016 16:12:40 +0100
Subject: Add cobrand call_hook fn, calls a fn if defined.

---
 perllib/FixMyStreet/App.pm                       |  2 +-
 perllib/FixMyStreet/App/Controller/Report/New.pm |  9 +++------
 perllib/FixMyStreet/Cobrand/Base.pm              | 12 ++++++++++++
 perllib/FixMyStreet/DB/Result/Problem.pm         | 19 +++++--------------
 perllib/FixMyStreet/Script/Reports.pm            |  4 +---
 perllib/FixMyStreet/SendReport/Email.pm          |  2 +-
 6 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 7c5ef488b..2fc560bc8 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -163,7 +163,7 @@ sub setup_request {
 
     my $cobrand = $c->cobrand;
 
-    $cobrand->add_response_headers if $cobrand->can('add_response_headers');
+    $cobrand->call_hook('add_response_headers');
 
     # append the cobrand templates to the include path
     $c->stash->{additional_template_paths} = $cobrand->path_to_web_templates;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 6d90b6ee9..2a68b170e 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -659,8 +659,7 @@ sub setup_categories_and_bodies : Private {
         push @category_options, _('Other') if $seen{_('Other')};
     }
 
-    $c->cobrand->munge_category_list(\@category_options, \@contacts, \%category_extras)
-        if $c->cobrand->can('munge_category_list');
+    $c->cobrand->call_hook(munge_category_list => \@category_options, \@contacts, \%category_extras);
 
     # put results onto stash for display
     $c->stash->{bodies} = \%bodies;
@@ -903,7 +902,7 @@ sub contacts_to_bodies : Private {
     if ($c->stash->{unresponsive}{$category} || $c->stash->{unresponsive}{ALL}) {
         [];
     } else {
-        if ( $c->cobrand->can('singleton_bodies_str') && $c->cobrand->singleton_bodies_str ) {
+        if ( $c->cobrand->call_hook('singleton_bodies_str') ) {
             # Cobrands like Zurich can only ever have a single body: 'x', because some functionality
             # relies on string comparison against bodies_str.
             [ $contacts[0]->body ];
@@ -1033,9 +1032,7 @@ sub send_problem_confirm_email : Private {
     $template = 'problem-confirm-not-sending.txt' unless $report->bodies_str;
 
     $c->stash->{token_url} = $c->uri_for_email( '/P', $token->token );
-    if ($c->cobrand->can('problem_confirm_email_extras')) {
-        $c->cobrand->problem_confirm_email_extras($report);
-    }
+    $c->cobrand->call_hook(problem_confirm_email_extras => $report);
 
     $c->send_email( $template, {
         to => [ $report->name ? [ $report->user->email, $report->name ] : $report->user->email ],
diff --git a/perllib/FixMyStreet/Cobrand/Base.pm b/perllib/FixMyStreet/Cobrand/Base.pm
index a9eed0018..ea2b8f410 100644
--- a/perllib/FixMyStreet/Cobrand/Base.pm
+++ b/perllib/FixMyStreet/Cobrand/Base.pm
@@ -65,6 +65,18 @@ sub is_default {
     return $self->moniker eq 'default';
 }
 
+=head2 call_hook
+
+  $cobrand->call_hook(foo => 1, 2, 3); # calls $cobrand->foo(1, 2, 3) if it exists
+
+=cut
+
+sub call_hook {
+    my ($self, $method_name, @args) = @_;
+    my $method = $self->can($method_name) or return;
+    return $self->$method(@args);
+}
+
 # NB: this Base class is for 'meta' features.  To add base methods for all cobrands,
 # you may want to look at FMS::Cobrand::Default instead!
 
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 97cb28fe8..f469c4275 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -613,9 +613,7 @@ sub meta_line {
     my $meta = '';
 
     my $category = $problem->category;
-    if ($c->cobrand->can('change_category_text')) {
-        $category = $c->cobrand->change_category_text($category);
-    }
+    $category = $c->cobrand->call_hook(change_category_text => $category) || $category;
 
     if ( $problem->anonymous ) {
         if ( $problem->service and $category && $category ne _('Other') ) {
@@ -748,17 +746,10 @@ sub can_display_external_id {
 
 sub duration_string {
     my ( $problem, $c ) = @_;
-    my $body;
-    if ( $c->cobrand->can('link_to_council_cobrand') ) {
-        $body = $c->cobrand->link_to_council_cobrand($problem);
-    } else {
-        $body = $problem->body( $c );
-    }
-    if ( $c->cobrand->can('get_body_handler_for_problem') ) {
-        my $handler = $c->cobrand->get_body_handler_for_problem( $problem );
-        if ( $handler->can('is_council_with_case_management') && $handler->is_council_with_case_management ) {
-            return sprintf(_('Received by %s moments later'), $body);
-        }
+    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);
+    if ( $handler && $handler->call_hook('is_council_with_case_management') ) {
+        return sprintf(_('Received by %s moments later'), $body);
     }
     return unless $problem->whensent;
     return sprintf(_('Sent to %s %s later'), $body,
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index 193c5fa41..a7f3cb84b 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -112,9 +112,7 @@ sub send(;$) {
             $h{user_details} .= sprintf(_('Email: %s'), $row->user->email) . "\n\n";
         }
 
-        if ($cobrand->can('process_additional_metadata_for_email')) {
-            $cobrand->process_additional_metadata_for_email($row, \%h);
-        }
+        $cobrand->call_hook(process_additional_metadata_for_email => $row, \%h);
 
         my $bodies = FixMyStreet::DB->resultset('Body')->search(
             { id => $row->bodies_str_ids },
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 4cee58d42..5a287a208 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -84,7 +84,7 @@ sub send {
         From => $self->send_from( $row ),
     };
 
-    $cobrand->munge_sendreport_params($row, $h, $params) if $cobrand->can('munge_sendreport_params');
+    $cobrand->call_hook(munge_sendreport_params => $row, $h, $params);
 
     $params->{Bcc} = $self->bcc if @{$self->bcc};
 
-- 
cgit v1.2.3


From bb99a8917a9b7fc38f0c0847f45c68659791b54a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 14 Dec 2016 17:31:02 +0000
Subject: Add external_id field to ResponsePriority for use with Exor

---
 bin/update-schema                                              |  1 +
 db/schema.sql                                                  |  1 +
 db/schema_0049-response-priorities-add-external_id.sql         |  6 ++++++
 perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm |  1 +
 perllib/FixMyStreet/DB/Result/ResponsePriority.pm              |  6 ++++--
 templates/web/base/admin/responsepriorities/edit.html          | 10 ++++++++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 db/schema_0049-response-priorities-add-external_id.sql

diff --git a/bin/update-schema b/bin/update-schema
index b85ff87f4..94c42d8ae 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -194,6 +194,7 @@ else {
 # By querying the database schema, we can see where we're currently at
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
+    return '0049' if column_exists('response_priorities', 'external_id');
     return '0048' if column_exists('response_templates', 'state');
     return '0047' if column_exists('response_priorities', 'description');
     return '0046' if column_exists('users', 'extra');
diff --git a/db/schema.sql b/db/schema.sql
index e54c6b7b2..23db82b65 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -135,6 +135,7 @@ CREATE TABLE response_priorities (
     deleted boolean not null default 'f',
     name text not null,
     description text,
+    external_id text,
     unique(body_id, name)
 );
 
diff --git a/db/schema_0049-response-priorities-add-external_id.sql b/db/schema_0049-response-priorities-add-external_id.sql
new file mode 100644
index 000000000..1d8a1ba1e
--- /dev/null
+++ b/db/schema_0049-response-priorities-add-external_id.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE response_priorities
+    ADD COLUMN external_id TEXT;
+
+COMMIT;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm b/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
index a6c13c117..bae0f71a7 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ResponsePriorities.pm
@@ -70,6 +70,7 @@ sub edit : Path : Args(2) {
         $priority->deleted( $c->get_param('deleted') ? 1 : 0 );
         $priority->name( $c->get_param('name') );
         $priority->description( $c->get_param('description') );
+        $priority->external_id( $c->get_param('external_id') );
         $priority->update_or_insert;
 
         my @live_contact_ids = map { $_->id } @live_contacts;
diff --git a/perllib/FixMyStreet/DB/Result/ResponsePriority.pm b/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
index 6bc8474fa..44635d174 100644
--- a/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
+++ b/perllib/FixMyStreet/DB/Result/ResponsePriority.pm
@@ -26,6 +26,8 @@ __PACKAGE__->add_columns(
   { data_type => "boolean", default_value => \"false", is_nullable => 0 },
   "description",
   { data_type => "text", is_nullable => 1 },
+  "external_id",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint("response_priorities_body_id_name_key", ["body_id", "name"]);
@@ -49,8 +51,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-10-17 16:37:28
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wok3cPA7cPjG4e9lnc1PIg
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-12-14 17:12:09
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:glsO0fLK6fNvg4TmW1DMPg
 
 __PACKAGE__->many_to_many( contacts => 'contact_response_priorities', 'contact' );
 
diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html
index 4d838eed2..a4dc61213 100644
--- a/templates/web/base/admin/responsepriorities/edit.html
+++ b/templates/web/base/admin/responsepriorities/edit.html
@@ -18,6 +18,16 @@
         <input type="text" name="description" class="form-control" size="30" value="[% rp.description | html %]">
     </p>
 
+    <div class="admin-hint">
+      <p>
+        [% loc('If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here.') %]
+      </p>
+    </div>
+    <p>
+        <strong>[% loc('External ID:') %] </strong>
+        <input type="text" name="external_id" class="form-control" size="30" value="[% rp.external_id | html %]">
+    </p>
+
     <div class="admin-hint">
       <p>
         [% loc('If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories.') %]
-- 
cgit v1.2.3


From 71e4186cefa356f240870cd5edf0e15b27e5e044 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 18 Jan 2017 14:32:19 +0000
Subject: =?UTF-8?q?Clarify=20=E2=80=98inspected=E2=80=99=20behaviour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A report is now considered 'inspected' if its state was changed by an inspector.
Additionally, an AdminLog entry is created so the time of inspection and
inspector can be recorded.
---
 perllib/FixMyStreet/App/Controller/Report.pm | 15 ++++++++++-----
 t/app/controller/report_inspect.t            | 15 ++++++++-------
 templates/web/base/report/_inspect.html      |  2 +-
 web/cobrands/fixmystreet/offline.js          |  2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 175db4a19..ad26ecf84 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -343,12 +343,9 @@ sub inspect : Private {
                 $problem->set_extra_metadata( $_ => $c->get_param($_) );
             }
 
-            if ( $c->get_param('save_inspected') ) {
+            if ( $c->get_param('include_update') ) {
                 $update_text = Utils::cleanup_text( $c->get_param('public_update'), { allow_multiline => 1 } );
-                if ($update_text) {
-                    $problem->set_extra_metadata( inspected => 1 );
-                    $reputation_change = 1;
-                } else {
+                if (!$update_text) {
                     $valid = 0;
                     $c->stash->{errors} ||= [];
                     push @{ $c->stash->{errors} }, _('Please provide a public update for this report.');
@@ -374,6 +371,14 @@ sub inspect : Private {
             }
             if ( $problem->state ne $old_state ) {
                 $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'state_change' ] );
+
+                # If the state has been changed by an inspector, consider the
+                # report to be inspected.
+                unless ($problem->get_extra_metadata('inspected')) {
+                    $problem->set_extra_metadata( inspected => 1 );
+                    $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'inspected' ] );
+                    $reputation_change = 1;
+                }
             }
         }
 
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index 9888fc0f4..be2240cd2 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -57,7 +57,7 @@ FixMyStreet::override_config {
     };
 
     subtest "test basic inspect submission" => sub {
-        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Action Scheduled', save_inspected => undef } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { traffic_information => 'Yes', state => 'Action Scheduled', include_update => undef } });
         $report->discard_changes;
         is $report->state, 'action scheduled', 'report state changed';
         is $report->get_extra_metadata('traffic_information'), 'Yes', 'report data changed';
@@ -65,10 +65,11 @@ FixMyStreet::override_config {
 
     subtest "test inspect & instruct submission" => sub {
         $report->unset_extra_metadata('inspected');
+        $report->state('confirmed');
         $report->update;
         my $reputation = $report->user->get_extra_metadata("reputation") || 0;
         $mech->get_ok("/report/$report_id");
-        $mech->submit_form_ok({ button => 'save', with_fields => { public_update => "This is a public update.", save_inspected => "1" } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { public_update => "This is a public update.", include_update => "1", state => 'action scheduled' } });
         $report->discard_changes;
         is $report->comments->first->text, "This is a public update.", 'Update was created';
         is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
@@ -80,7 +81,7 @@ FixMyStreet::override_config {
         $report->update;
         $report->comments->delete_all;
         $mech->get_ok("/report/$report_id");
-        $mech->submit_form_ok({ button => 'save', with_fields => { public_update => undef, save_inspected => "1" } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { public_update => undef, include_update => "1" } });
         is_deeply $mech->page_errors, [ "Please provide a public update for this report." ], 'errors match';
         $report->discard_changes;
         is $report->comments->count, 0, "Update wasn't created";
@@ -117,7 +118,7 @@ FixMyStreet::override_config {
         $report->comments->delete_all;
 
         $mech->get_ok("/report/$report_id");
-        $mech->submit_form_ok({ button => 'save', with_fields => { state => 'Duplicate', duplicate_of => $report2->id, public_update => "This is a duplicate.", save_inspected => "1" } });
+        $mech->submit_form_ok({ button => 'save', with_fields => { state => 'Duplicate', duplicate_of => $report2->id, public_update => "This is a duplicate.", include_update => "1" } });
         $report->discard_changes;
 
         is $report->state, 'duplicate', 'report marked as duplicate';
@@ -136,7 +137,7 @@ FixMyStreet::override_config {
             state => 'Duplicate',
             duplicate_of => $report2->id,
             public_update => $update_text,
-            save_inspected => "1",
+            include_update => "1",
         }});
         $report->discard_changes;
 
@@ -190,7 +191,7 @@ FixMyStreet::override_config {
     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', save_inspected => undef } });
+        $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';
@@ -211,7 +212,7 @@ FixMyStreet::override_config {
         # which should cause it to be resent. We clear the host because
         # otherwise testing stays on host() above.
         $mech->clear_host;
-        $mech->submit_form(button => 'save', with_fields => { category => 'Horses', save_inspected => undef, });
+        $mech->submit_form(button => 'save', with_fields => { category => 'Horses', include_update => undef, });
 
         $report->discard_changes;
         is $report->category, "Horses", "Report in correct category";
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 5a7e99ef9..33b548c76 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -127,7 +127,7 @@
         [% IF permissions.report_inspect %]
           <p>
             <label class="label-containing-checkbox">
-              <input type="checkbox" name="save_inspected" value="1" class="js-toggle-public-update" checked>
+              <input type="checkbox" name="include_update" value="1" class="js-toggle-public-update" checked>
               [% loc('Save with a public update') %]
             </label>
           </p>
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 7b9be4c6c..0fdad1279 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -322,7 +322,7 @@ fixmystreet.offline = (function() {
         if (savedForm) {
             savedForm.replace(/\+/g, '%20').split('&').forEach(function(kv) {
                 kv = kv.split('=', 2);
-                if (kv[0] != 'save_inspected' && kv[0] != 'public_update' && kv[0] != 'save') {
+                if (kv[0] != 'include_update' && kv[0] != 'public_update' && kv[0] != 'save') {
                     $('[name=' + kv[0] + ']').val(decodeURIComponent(kv[1]));
                 }
             });
-- 
cgit v1.2.3


From 0b1bc26366811481b322c322f2414514bb7c2166 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 1 Feb 2017 11:40:38 +0000
Subject: Allow cobrands to control which states affect reputation

Rather than assigning +1 to a user's reputation every time a report is
inspected, this allows cobrands to specify which states should increment or
decrement the reputation value when a report is inspected.

The default behaviour is for reputation to never be changed, but the Oxfordshire
cobrand will increment the reputation when a report is marked as 'action
scheduled'.

For mysociety/fixmystreetforcouncils#119
---
 perllib/FixMyStreet/App/Controller/Report.pm |  4 +++-
 perllib/FixMyStreet/Cobrand/Default.pm       | 10 ++++++++++
 t/app/controller/report_inspect.t            | 21 ++++++++++++++++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index ad26ecf84..5c34630c4 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -377,7 +377,9 @@ sub inspect : Private {
                 unless ($problem->get_extra_metadata('inspected')) {
                     $problem->set_extra_metadata( inspected => 1 );
                     $c->forward( '/admin/log_edit', [ $problem->id, 'problem', 'inspected' ] );
-                    $reputation_change = 1;
+                    my $state = $problem->state;
+                    $reputation_change = 1 if $c->cobrand->reputation_increment_states->{$state};
+                    $reputation_change = -1 if $c->cobrand->reputation_decrement_states->{$state};
                 }
             }
         }
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 1fdbe9de2..b8767ab73 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1188,6 +1188,16 @@ sub category_extra_hidden {
 	return 0;
 }
 
+=head2 reputation_increment_states/reputation_decrement_states
+
+Get a hashref of states that cause the reporting user's reputation to be
+incremented/decremented, if a report is changed to this state upon inspection.
+
+=cut
+
+sub reputation_increment_states { {} };
+sub reputation_decrement_states { {} };
+
 sub traffic_management_options {
     return [
         _("Yes"),
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index be2240cd2..cc98f2b64 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -67,18 +67,20 @@ FixMyStreet::override_config {
         $report->unset_extra_metadata('inspected');
         $report->state('confirmed');
         $report->update;
-        my $reputation = $report->user->get_extra_metadata("reputation") || 0;
+        $report->inspection_log_entry->delete;
+        my $reputation = $report->user->get_extra_metadata("reputation");
         $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' } });
         $report->discard_changes;
         is $report->comments->first->text, "This is a public update.", 'Update was created';
         is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
-        is $report->user->get_extra_metadata('reputation'), $reputation+1, "User reputation was increased";
+        is $report->user->get_extra_metadata('reputation'), $reputation, "User reputation wasn't changed";
     };
 
     subtest "test update is required when instructing" => sub {
         $report->unset_extra_metadata('inspected');
         $report->update;
+        $report->inspection_log_entry->delete;
         $report->comments->delete_all;
         $mech->get_ok("/report/$report_id");
         $mech->submit_form_ok({ button => 'save', with_fields => { public_update => undef, include_update => "1" } });
@@ -179,13 +181,26 @@ FixMyStreet::override_config {
     ALLOWED_COBRANDS => 'oxfordshire',
 }, sub {
     subtest "test negative reputation" => sub {
-        my $reputation = $report->user->get_extra_metadata("reputation");
+        my $reputation = $report->user->get_extra_metadata("reputation") || 0;
 
         $mech->get_ok("/report/$report_id");
         $mech->submit_form( button => 'remove_from_site' );
 
         $report->discard_changes;
         is $report->user->get_extra_metadata('reputation'), $reputation-1, "User reputation was decreased";
+        $report->update({ state => 'confirmed' });
+    };
+
+    subtest "test positive reputation" => sub {
+        $report->unset_extra_metadata('inspected');
+        $report->update;
+        $report->inspection_log_entry->delete if $report->inspection_log_entry;
+        my $reputation = $report->user->get_extra_metadata("reputation") || 0;
+        $mech->get_ok("/report/$report_id");
+        $mech->submit_form_ok({ button => 'save', with_fields => { state => 'action scheduled', include_update => undef } });
+        $report->discard_changes;
+        is $report->get_extra_metadata('inspected'), 1, 'report marked as inspected';
+        is $report->user->get_extra_metadata('reputation'), $reputation+1, "User reputation was increased";
     };
 
     subtest "Oxfordshire-specific traffic management options are shown" => sub {
-- 
cgit v1.2.3


From 1bbcf0f979a003b502043c0cef0126950fd1157c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 15 Feb 2017 17:30:34 +0000
Subject: [Oxfordshire] Add initials field to admin user edit form

---
 perllib/FixMyStreet/App/Controller/Admin.pm                 | 13 +++++++++++++
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm                  | 10 ++++++++++
 templates/web/base/admin/user-form.html                     |  1 +
 templates/web/oxfordshire/admin/user-form-extra-fields.html | 12 ++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 templates/web/oxfordshire/admin/user-form-extra-fields.html

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 5d496e7e8..11bdca805 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1217,6 +1217,8 @@ sub user_add : Path('user_edit') : Args(0) {
         key => 'users_email_key'
     } );
     $c->stash->{user} = $user;
+    $c->forward('user_cobrand_extra_fields');
+    $user->update;
 
     $c->forward( 'log_edit', [ $user->id, 'user', 'edit' ] );
 
@@ -1281,6 +1283,8 @@ sub user_edit : Path('user_edit') : Args(1) {
             $user->from_body( undef );
         }
 
+        $c->forward('user_cobrand_extra_fields');
+
         # Has the user's from_body changed since we fetched areas (if we ever did)?
         # If so, we need to re-fetch areas so the UI is up to date.
         if ( $user->from_body && $user->from_body->id ne $c->stash->{fetched_areas_body_id} ) {
@@ -1397,6 +1401,15 @@ sub user_edit : Path('user_edit') : Args(1) {
     return 1;
 }
 
+sub user_cobrand_extra_fields : Private {
+    my ( $self, $c ) = @_;
+
+    my @extra_fields = @{ $c->cobrand->call_hook('user_extra_fields') || [] };
+    foreach ( @extra_fields ) {
+        $c->stash->{user}->set_extra_metadata( $_ => $c->get_param("extra[$_]") );
+    }
+}
+
 sub flagged : Path('flagged') : Args(0) {
     my ( $self, $c ) = @_;
 
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index e58c7f36b..cf9d6a9a4 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -130,4 +130,14 @@ sub traffic_management_options {
 }
 
 
+sub reputation_increment_states {
+    return {
+        'action scheduled' => 1,
+    };
+}
+
+sub user_extra_fields {
+    return [ 'initials' ];
+}
+
 1;
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 0f5452b0a..4dd207bb3 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -173,6 +173,7 @@
             </ul>
         [% END %]
       [% END %]
+      [% TRY %][% INCLUDE 'admin/user-form-extra-fields.html' %][% CATCH file %][% END %]
     </ul>
     <input type="submit" class="btn" name="Submit changes" value="[% loc('Submit changes') %]" >
 </form>
diff --git a/templates/web/oxfordshire/admin/user-form-extra-fields.html b/templates/web/oxfordshire/admin/user-form-extra-fields.html
new file mode 100644
index 000000000..c7697fa35
--- /dev/null
+++ b/templates/web/oxfordshire/admin/user-form-extra-fields.html
@@ -0,0 +1,12 @@
+<li>
+  <div class="admin-hint">
+    <p>
+      [% loc(
+        "The user's initials are used when sending inspections to Exor.
+        Only inspectors need to have this field filled in.")
+      %]
+    </p>
+  </div>
+  <label for="initials">[% loc('Initials:') %]</label>
+  <input type='text' class="form-control" name='extra[initials]' id='initials' value='[% user.get_extra_metadata("initials") | html %]'>
+</li>
-- 
cgit v1.2.3


From cd7e3087567b0fa7e64f52d802e5e911708a7eb8 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 1 Feb 2017 11:44:49 +0000
Subject: [Oxfordshire] Don't show user reputation on other cobrands

---
 templates/web/base/admin/user-form.html                     | 8 --------
 templates/web/oxfordshire/admin/user-form-extra-fields.html | 9 +++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 4dd207bb3..dbd554b1e 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -121,14 +121,6 @@
               </label>
             [% END %]
           </li>
-          <li>
-            <div class="admin-hint">
-              <p>
-                [% loc("Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors.") %]
-              </p>
-            </div>
-            [% loc('Reputation:') %] [% user.get_extra_metadata('reputation') %]
-          </li>
         [% END %]
 
         [% IF c.user.is_superuser %]
diff --git a/templates/web/oxfordshire/admin/user-form-extra-fields.html b/templates/web/oxfordshire/admin/user-form-extra-fields.html
index c7697fa35..4109a3075 100644
--- a/templates/web/oxfordshire/admin/user-form-extra-fields.html
+++ b/templates/web/oxfordshire/admin/user-form-extra-fields.html
@@ -1,3 +1,12 @@
+<li>
+  <div class="admin-hint">
+    <p>
+      [% loc("Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors.") %]
+    </p>
+  </div>
+  [% loc('Reputation:') %] [% user.get_extra_metadata('reputation') %]
+</li>
+
 <li>
   <div class="admin-hint">
     <p>
-- 
cgit v1.2.3


From 4d44ea5530a7dc25122e5135c19d89b4cebc5f40 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 7 Dec 2016 11:39:59 +0000
Subject: [Oxfordshire] Add Exor RDI file download feature

The RDI file format encapsulates information about inspections that have taken
place, and can be uploaded into Exor to create defects in bulk.

This commit adds a page to the Oxfordshire cobrand's admin allowing RDI files
to be generated and downloaded from FMS.

For mysociety/fixmystreetforcouncils#127
---
 .../App/Controller/Admin/ExorDefects.pm            | 219 +++++++++++++++++++++
 perllib/FixMyStreet/App/Controller/Report.pm       |   2 +-
 perllib/FixMyStreet/Cobrand/Default.pm             |   1 -
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |  25 +++
 perllib/FixMyStreet/Cobrand/UKCouncils.pm          |   2 +-
 perllib/FixMyStreet/DB/Result/Problem.pm           |   9 +
 t/cobrand/oxfordshire.t                            |  23 +++
 templates/web/base/admin/exordefects/index.html    |  36 ++++
 templates/web/base/report/_inspect.html            |  12 ++
 web/js/fixmystreet-admin.js                        |  18 +-
 10 files changed, 342 insertions(+), 5 deletions(-)
 create mode 100644 perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
 create mode 100644 templates/web/base/admin/exordefects/index.html

diff --git a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
new file mode 100644
index 000000000..164a4b42d
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
@@ -0,0 +1,219 @@
+package FixMyStreet::App::Controller::Admin::ExorDefects;
+use Moose;
+use namespace::autoclean;
+
+use Text::CSV;
+use DateTime;
+use mySociety::Random qw(random_bytes);
+
+BEGIN { extends 'Catalyst::Controller'; }
+
+
+sub begin : Private {
+    my ( $self, $c ) = @_;
+
+    $c->forward('/admin/begin');
+}
+
+sub index : Path : Args(0) {
+    my ( $self, $c ) = @_;
+
+    foreach (qw(error_message start_date end_date user_id)) {
+        if ( defined $c->flash->{$_} ) {
+            $c->stash->{$_} = $c->flash->{$_};
+        }
+    }
+
+    my @inspectors = $c->cobrand->users->search({
+        'user_body_permissions.permission_type' => 'report_inspect'
+    }, {
+            join => 'user_body_permissions',
+            distinct => 1,
+        }
+    )->all;
+    $c->stash->{inspectors} = \@inspectors;
+
+    # Default start/end date is today
+    my $now = DateTime->now( time_zone => 
+        FixMyStreet->time_zone || FixMyStreet->local_time_zone );
+    $c->stash->{start_date} ||= $now;
+    $c->stash->{end_date} ||= $now;
+
+}
+
+sub download : Path('download') : Args(0) {
+    my ( $self, $c ) = @_;
+
+    if ( !$c->cobrand->can('exor_rdi_link_id') ) {
+        # This only works on the Oxfordshire cobrand currently.
+        $c->detach( '/page_error_404_not_found', [] );
+    }
+
+    my $parser = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y' );
+    my $start_date = $parser-> parse_datetime ( $c->get_param('start_date') );
+    my $end_date = $parser-> parse_datetime ( $c->get_param('end_date') ) ;
+    my $one_day = DateTime::Duration->new( days => 1 );
+
+    my %params = (
+        -and => [
+            state => [ 'action scheduled' ],
+            'admin_log_entries.action' => 'inspected',
+            'admin_log_entries.whenedited' => { '>=', $start_date },
+            'admin_log_entries.whenedited' => { '<=', $end_date + $one_day },
+        ]
+    );
+
+    my $user;
+    if ( $c->get_param('user_id') ) {
+        my $uid = $c->get_param('user_id');
+        $params{'admin_log_entries.user_id'} = $uid;
+        $user = $c->model('DB::User')->find( { id => $uid } );
+    }
+
+    my $problems = $c->cobrand->problems->search(
+        \%params,
+        {
+            join => 'admin_log_entries',
+            distinct => 1,
+        }
+    );
+
+    if ( !$problems->count ) {
+        if ( defined $user ) {
+            $c->flash->{error_message} = _("No inspections by that inspector in the selected date range.");
+        } else {
+            $c->flash->{error_message} = _("No inspections in the selected date range.");
+        }
+        $c->flash->{start_date} = $start_date;
+        $c->flash->{end_date} = $end_date;
+        $c->flash->{user_id} = $user->id if $user;
+        $c->res->redirect( $c->uri_for( '' ) );
+    }
+
+    # A single RDI file might contain inspections from multiple inspectors, so
+    # we need to group inspections by inspector within G records.
+    my $inspectors = {};
+    my $inspector_initials = {};
+    while ( my $report = $problems->next ) {
+        my $user = $report->inspection_log_entry->user;
+        $inspectors->{$user->id} ||= [];
+        push @{ $inspectors->{$user->id} }, $report;
+        unless ( $inspector_initials->{$user->id} ) {
+            $inspector_initials->{$user->id} = $user->get_extra_metadata('initials');
+        }
+    }
+
+    my $csv = Text::CSV->new({ binary => 1, eol => "" });
+
+    my $p_count = 0;
+    my $link_id = $c->cobrand->exor_rdi_link_id;
+
+    # RDI first line is always the same
+    $csv->combine("1", "1.8", "1.0.0.0", "ENHN", "");
+    my @body = ($csv->string);
+
+    my $i = 0;
+    foreach my $inspector_id (keys %$inspectors) {
+        my $inspections = $inspectors->{$inspector_id};
+        my $initials = $inspector_initials->{$inspector_id};
+
+        $csv->combine(
+            "G", # start of an area/sequence
+            $link_id, # area/link id, fixed value for our purposes
+            "","", # must be empty
+            $initials || "XX", # inspector initials
+            $start_date->strftime("%y%m%d"), # date of inspection yymmdd
+            "0700", # time of inspection hhmm, set to static value for now
+            "D", # inspection variant, should always be D
+            "INS", # inspection type, always INS
+            "N", # Area of the county - north (N) or south (S)
+            "", "", "", "" # empty fields
+        );
+        push @body, $csv->string;
+
+        $csv->combine(
+            "H", # initial inspection type
+            "MC" # minor carriageway (changes depending on activity code)
+        );
+        push @body, $csv->string;
+
+        foreach my $report (@$inspections) {
+            my ($eastings, $northings) = $report->local_coords;
+            my $description = sprintf("%s %s", $report->external_id || "", $report->get_extra_metadata('detailed_information') || "");
+            $csv->combine(
+                "I", # beginning of defect record
+                "MC", # activity code - minor carriageway, also FC (footway)
+                "", # empty field, can also be A (seen on MC) or B (seen on FC)
+                sprintf("%03d", ++$i), # randomised sequence number
+                "${eastings}E ${northings}N", # defect location field, which we don't capture from inspectors
+                $report->inspection_log_entry->whenedited->strftime("%H%M"), # defect time raised
+                "","","","","","","", # empty fields
+                $report->get_extra_metadata('traffic_information') ? 'TM required' : 'TM none', # further description
+                $description, # defect description
+            );
+            push @body, $csv->string;
+
+            $csv->combine(
+                "J", # georeferencing record
+                $report->get_extra_metadata('defect_type') || 'SFP2', # defect type - SFP2: sweep and fill <1m2, POT2 also seen
+                $report->response_priority ?
+                    $report->response_priority->external_id :
+                    "2", # priority of defect
+                "","", # empty fields
+                $eastings, # eastings
+                $northings, # northings
+                "","","","","" # empty fields
+            );
+            push @body, $csv->string;
+
+            $csv->combine(
+                "M", # bill of quantities record
+                "resolve", # permanent repair
+                "","", # empty fields
+                "/CMC", # /C + activity code
+                "", "" # empty fields
+            );
+            push @body, $csv->string;
+        }
+
+        # end this group of defects with a P record
+        $csv->combine(
+            "P", # end of area/sequence
+            0, # always 0
+            999999, # charging code, always 999999 in OCC
+        );
+        push @body, $csv->string;
+        $p_count++;
+    }
+
+    # end the RDI file with an X record
+    my $record_count = $i;
+    $csv->combine(
+        "X", # end of inspection record
+        $p_count,
+        $p_count,
+        $record_count, # number of I records
+        $record_count, # number of J records
+        0, 0, 0, # always zero
+        $record_count, # number of M records
+        0, # always zero
+        $p_count,
+        0, 0, 0 # error counts, always zero
+    );
+    push @body, $csv->string;
+
+    my $start = $start_date->strftime("%Y%m%d");
+    my $end = $end_date->strftime("%Y%m%d");
+    my $filename = sprintf("exor_defects-%s-%s.rdi", $start, $end);
+    if ( $user ) {
+        my $initials = $user->get_extra_metadata("initials") || "";
+        $filename = sprintf("exor_defects-%s-%s-%s.rdi", $start, $end, $initials);
+    }
+    $c->res->content_type('text/csv; charset=utf-8');
+    $c->res->header('content-disposition' => "attachment; filename=$filename");
+    # The RDI format is very weird CSV - each line must be wrapped in
+    # double quotes.
+    $c->res->body( join "", map { "\"$_\"\r\n" } @body );
+}
+
+1;
\ No newline at end of file
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 5c34630c4..35d7afd5b 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -339,7 +339,7 @@ sub inspect : Private {
         my %update_params = ();
 
         if ($permissions->{report_inspect}) {
-            foreach (qw/detailed_information traffic_information duplicate_of/) {
+            foreach (qw/detailed_information traffic_information duplicate_of defect_type/) {
                 $problem->set_extra_metadata( $_ => $c->get_param($_) );
             }
 
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index b8767ab73..63db8b64a 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -665,7 +665,6 @@ sub admin_pages {
         $pages->{responsepriorities} = [ _('Priorities'), 4 ];
         $pages->{responsepriority_edit} = [ undef, undef ];
     };
-
     if ( $user->has_body_permission_to('user_edit') ) {
         $pages->{users} = [ _('Users'), 6 ];
         $pages->{user_edit} = [ undef, undef ];
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index cf9d6a9a4..7fa548406 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -129,6 +129,31 @@ sub traffic_management_options {
     ];
 }
 
+sub admin_pages {
+    my $self = shift;
+
+    my $user = $self->{c}->user;
+
+    my $pages = $self->next::method();
+
+    # Oxfordshire have a custom admin page for downloading reports in an Exor-
+    # friendly format which anyone with report_instruct permission can use.
+    if ( $user->is_superuser || $user->has_body_permission_to('report_instruct') ) {
+        $pages->{exordefects} = [ _('Download Exor RDI'), 10 ];
+    }
+
+    return $pages;
+}
+
+sub defect_types {
+    {
+        SFP2 => "SFP2: sweep and fill <1m2",
+        POT2 => "POT2",
+    };
+}
+
+sub exor_rdi_link_id { 1989169 }
+sub exor_rdi_link_length { 50 }
 
 sub reputation_increment_states {
     return {
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 4e900e653..e0b6b5298 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -76,7 +76,7 @@ sub users_restriction {
 
     my $or_query = [
         from_body => $self->council_id,
-        id => [ { -in => $problem_user_ids }, { -in => $update_user_ids } ],
+        'me.id' => [ { -in => $problem_user_ids }, { -in => $update_user_ids } ],
     ];
     if ($self->can('admin_user_domain')) {
         my $domain = $self->admin_user_domain;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index f469c4275..d78eda78f 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -1100,4 +1100,13 @@ has traffic_management_options => (
     },
 );
 
+has inspection_log_entry => (
+    is => 'ro',
+    lazy => 1,
+    default => sub {
+        my $self = shift;
+        return $self->admin_log_entries->search({ action => 'inspected' }, { order_by => { -desc => 'whenedited' } })->first;
+    },
+);
+
 1;
diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t
index d9f880d07..b0fad3b56 100644
--- a/t/cobrand/oxfordshire.t
+++ b/t/cobrand/oxfordshire.t
@@ -45,6 +45,29 @@ subtest 'check /ajax defaults to open reports only' => sub {
     }
 };
 
+my $superuser = $mech->create_user_ok('superuser@example.com', name => 'Super User', is_superuser => 1);
+
+subtest 'Exor RDI download appears on Oxfordshire cobrand admin' => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { 'oxfordshire' => '.' } ],
+    }, sub {
+        $mech->log_in_ok( $superuser->email );
+        $mech->get_ok('/admin');
+        $mech->content_contains("Download Exor RDI");
+    }
+};
+
+subtest 'Exor RDI download doesn’t appear outside of Oxfordshire cobrand admin' => sub {
+    FixMyStreet::override_config {
+        ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+    }, sub {
+        $mech->log_in_ok( $superuser->email );
+        $mech->get_ok('/admin');
+        $mech->content_lacks("Download Exor RDI");
+    }
+};
+
 # Clean up
+$mech->delete_user( $superuser );
 $mech->delete_problems_for_body( 2237 );
 done_testing();
diff --git a/templates/web/base/admin/exordefects/index.html b/templates/web/base/admin/exordefects/index.html
new file mode 100644
index 000000000..06d2aa7a5
--- /dev/null
+++ b/templates/web/base/admin/exordefects/index.html
@@ -0,0 +1,36 @@
+[% INCLUDE 'admin/header.html' title=loc('Download Exor RDI') -%]
+
+[% IF error_message %]
+    <h2>Error</h2>
+    <p>[% error_message %]</p>
+[% END %]
+
+<form method="get" action="[% c.uri_for('download') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+    <p>
+    <label for="start_date">[% loc('Start Date:') %]</label><input type="text" class="form-control"
+      placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date"
+      value="[% start_date ? start_date.strftime( '%d/%m/%Y') : '' | html %]" />
+    </p>
+
+    <p>
+    <label for="end_date">[% loc('End Date:') %]</label><input type="text" class="form-control"
+      placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5"
+      value="[% end_date ? end_date.strftime( '%d/%m/%Y') : '' | html %]" />
+    </p>
+
+    <p>
+    [% loc('Inspector:') %] <select class="form-control" id='user_id' name='user_id'>
+        <option value=''>[% loc('All inspectors') %]</option>
+        [% FOR inspector IN inspectors %]
+            <option value="[% inspector.id %]" [% 'selected' IF user_id == inspector.id %]>[% inspector.name %] ([% inspector.get_extra_metadata('initials') %])</option>
+        [% END %]
+    </select>
+    </p>
+
+    <p>
+    <input type="submit" class="btn" size="30" value="Download RDI file" />
+    </p>
+</form>
+
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 33b548c76..625887eff 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -62,6 +62,18 @@
         [% END %]
 
         [% IF permissions.report_inspect %]
+          [% IF c.cobrand.defect_types %]
+            <p>
+              <label for="defect_type">[% loc('Defect type') %]</label>
+              [% defect_type = problem.get_extra_metadata('defect_type') %]
+              <select id="defect_type" name="defect_type" class="form-control">
+                <option value=""[% ' selected' IF NOT defect_type %]>-</option>
+                [% FOREACH dt IN c.cobrand.defect_types.pairs %]
+                  <option[% ' selected' IF defect_type == dt.key %] value="[% dt.key | html %]">[% dt.value | html %]</option>
+                [% END %]
+              </select>
+            </p>
+          [% END %]
           <p>
             <label for="state">[% loc('State') %]</label>
             [% INCLUDE 'report/inspect/state_groups_select.html' %]
diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js
index 884ad1c09..02eb30766 100644
--- a/web/js/fixmystreet-admin.js
+++ b/web/js/fixmystreet-admin.js
@@ -66,6 +66,18 @@ $(function(){
         });
     }
 
+    // On some cobrands the datepicker ends up beneath items in the header, e.g.
+    // the logo.
+    // This function sets an appropriate z-index when the datepicker is shown.
+    // Sadly there's no way to set the z-index when creating the datepicker, so
+    // we have to run this little helper using the datepicker beforeShow
+    // handler.
+    function fixZIndex() {
+        setTimeout(function() {
+            $('.ui-datepicker').css('z-index', 10);
+        }, 0);
+    }
+
     $( "#start_date" ).datepicker({
       defaultDate: "-1w",
       changeMonth: true,
@@ -73,7 +85,8 @@ $(function(){
       // This sets the other fields minDate to our date
       onClose: function( selectedDate ) {
         $( "#end_date" ).datepicker( "option", "minDate", selectedDate );
-      }
+      },
+      beforeShow: fixZIndex
     });
     $( "#end_date" ).datepicker({
      /// defaultDate: "+1w",
@@ -81,7 +94,8 @@ $(function(){
       dateFormat: 'dd/mm/yy' ,
       onClose: function( selectedDate ) {
         $( "#start_date" ).datepicker( "option", "maxDate", selectedDate );
-      }
+      },
+      beforeShow: fixZIndex
     });
 
     // On user edit page, hide the area/categories fields if body changes
-- 
cgit v1.2.3


From 39efe2bbd050b6eea6df4dd092739b4883840410 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 1 Apr 2016 17:24:17 +0100
Subject: [Oxfordshire] Open311 update timestamps should be in UTC

The timestamps returned from the database are in server-local time, not UTC.
Because FMS expects timestamps in Open311 responses to be UTC, the timestamps
of updates from OCC appear one hour ahead when DST is in effect.

This commit converts the timestamps to UTC before outputting them.

Fixes mysociety/FixMyStreet-Commercial#499
---
 bin/oxfordshire/open311_service_request_update.cgi |  2 +-
 bin/oxfordshire/open311_services.pm                | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/bin/oxfordshire/open311_service_request_update.cgi b/bin/oxfordshire/open311_service_request_update.cgi
index 87b14fb98..8fb190e0e 100755
--- a/bin/oxfordshire/open311_service_request_update.cgi
+++ b/bin/oxfordshire/open311_service_request_update.cgi
@@ -102,7 +102,7 @@ XML
     foreach my $row(@{$ary_ref})  {
         if (defined $row) {
             my ($id, $service_req_id, $updated_at, $status, $desc) = map { prepare_for_xml($_) } @$row;
-            $updated_at=~s/(\d{4}-\d\d-\d\d) (\d\d:\d\d:\d\d)/${1}T${2}Z/; # for now assume OCC in Zulu time
+            $updated_at = get_utc_iso8601_string($updated_at); # value from the DB is in server-local time, convert to UTC.
             $xml.= <<XML;
     <request_update>
         <update_id>$id</update_id>
diff --git a/bin/oxfordshire/open311_services.pm b/bin/oxfordshire/open311_services.pm
index 12d0754fa..9be598751 100644
--- a/bin/oxfordshire/open311_services.pm
+++ b/bin/oxfordshire/open311_services.pm
@@ -10,6 +10,8 @@ use CGI;
 use Encode qw(from_to);
 use DBI;
 use Time::Piece;
+use Time::Local qw(timelocal);
+use POSIX qw(strftime);
 
 
 ###################################################################
@@ -145,6 +147,20 @@ sub get_date_or_nothing {
     return $d;
 }
 
+#------------------------------------------------------------------
+# get_utc_iso8601_string
+# Takes a local date/time string and converts it to UTC, returning
+# a ISO8601-format string.
+# expected format: YYYY-MM-DD HH:MM:SS
+# e.g.: 2016-04-01 13:37:42 -> 2016-04-01T12:37:42Z
+#------------------------------------------------------------------
+sub get_utc_iso8601_string {
+    my $datetime = shift;
+    $datetime =~ s{(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)}{
+        strftime "%Y-%m-%dT%H:%M:%SZ", gmtime(timelocal($6, $5, $4, $3, int($2)-1, int($1)-1900));
+    }e;
+    return $datetime;
+}
 
 
 1;
-- 
cgit v1.2.3


From 53f8f462ab0d1772803516305da91fa2d622f1be Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Feb 2017 15:54:39 +0000
Subject: Include /admin link on top-level nav for admin users

Fixes mysociety/fixmystreetforcouncils#166
---
 templates/web/base/main_nav_items.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/web/base/main_nav_items.html b/templates/web/base/main_nav_items.html
index ca82b6560..6b5e09e56 100644
--- a/templates/web/base/main_nav_items.html
+++ b/templates/web/base/main_nav_items.html
@@ -42,3 +42,7 @@
 [%~ UNLESS hide_privacy_link ~%]
   [%~ INCLUDE navitem uri='/privacy' label=loc('Privacy') liattrs='class="nav-menu__item--privacy"' ~%]
 [%~ END ~%]
+
+[%~ IF c.user_exists AND c.cobrand.admin_allow_user(c.user) ~%]
+  [%~ INCLUDE navitem uri='/admin' label=loc('Admin') ~%]
+[%~ END ~%]
-- 
cgit v1.2.3


From 5df39f76b761d88dfa5ca86e8bf01a73115eba1c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 17 Feb 2017 15:50:46 +0000
Subject: Send open reports regardless of current state

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 2 +-
 perllib/FixMyStreet/Script/Reports.pm       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 11bdca805..a7b9fb169 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -78,7 +78,7 @@ sub index : Path : Args(0) {
     $c->forward('stats_by_state');
 
     my @unsent = $c->cobrand->problems->search( {
-        state => [ 'confirmed' ],
+        state => [ FixMyStreet::DB::Result::Problem::open_states() ],
         whensent => undef,
         bodies_str => { '!=', undef },
     } )->all;
diff --git a/perllib/FixMyStreet/Script/Reports.pm b/perllib/FixMyStreet/Script/Reports.pm
index a7f3cb84b..6057807de 100644
--- a/perllib/FixMyStreet/Script/Reports.pm
+++ b/perllib/FixMyStreet/Script/Reports.pm
@@ -28,7 +28,7 @@ sub send(;$) {
     my $base_url = FixMyStreet->config('BASE_URL');
     my $site = $site_override || CronFns::site($base_url);
 
-    my $states = [ 'confirmed', 'fixed' ];
+    my $states = [ FixMyStreet::DB::Result::Problem::open_states() ];
     $states = [ 'unconfirmed', 'confirmed', 'in progress', 'planned', 'closed', 'investigating' ] if $site eq 'zurich';
     my $unsent = $rs->search( {
         state => $states,
@@ -274,7 +274,7 @@ sub send(;$) {
         }
         my $sending_errors = '';
         my $unsent = $rs->search( {
-            state => [ 'confirmed', 'fixed' ],
+            state => [ FixMyStreet::DB::Result::Problem::open_states() ],
             whensent => undef,
             bodies_str => { '!=', undef },
             send_fail_count => { '>', 0 }
-- 
cgit v1.2.3


From 5414433c85749c2baed87c3e6ba4a60bc8103577 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 17 Feb 2017 16:32:50 +0000
Subject: Reports need external_id to be included in RDI download

Reports in the generated Exor RDI file need to have an external_id so they can
be linked to existing enquiries (PEMs) when the RDI is imported into Exor.
There is a small window of opportunity for a report to be created, inspected and
downloaded in an RDI before it's been sent to Exor via Open311 and had an
external_id assigned. This commit closes that window by excluding reports from
the RDI that don't have an external_id.

Fixes mysociety/fixmystreetforcouncils#168
---
 perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
index 164a4b42d..013d710af 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
@@ -57,6 +57,7 @@ sub download : Path('download') : Args(0) {
     my %params = (
         -and => [
             state => [ 'action scheduled' ],
+            external_id => { '!=' => undef },
             'admin_log_entries.action' => 'inspected',
             'admin_log_entries.whenedited' => { '>=', $start_date },
             'admin_log_entries.whenedited' => { '<=', $end_date + $one_day },
-- 
cgit v1.2.3


From 36838708a432de937828f6a8ef4aff608654f900 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Mon, 20 Feb 2017 14:51:56 +0000
Subject: [Travis] Switch notification to Freenode.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 17701566e..8ff5732e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ notifications:
   email: false
   irc:
     channels:
-      - "irc.mysociety.org#fixmystreet"
+      - "irc.freenode.net#fixmystreet"
     use_notice: true
     skip_join: true
   slack: mysociety:1M2CXeMwHIf8SrGoKyZrz0jO
-- 
cgit v1.2.3


From 587a125c46f229ed23aaf68d3308f6755e2d8299 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Tue, 24 Jan 2017 16:20:48 +0000
Subject: [Oxfordshire] Use 'days ago' format on problem lists

Fixes mysociety/fixmystreetforcouncils#98
---
 perllib/FixMyStreet/Cobrand/Default.pm     | 11 +++++++++++
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm |  2 ++
 perllib/FixMyStreet/DB/Result/Problem.pm   | 14 ++++++++++++++
 t/app/model/problem.t                      | 15 ++++++++++++++-
 templates/web/base/report/_item.html       | 12 ++++++++++--
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 63db8b64a..6d9f38d78 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -1204,4 +1204,15 @@ sub traffic_management_options {
     ];
 }
 
+
+=head2 display_days_ago_threshold
+
+Used to control whether a relative 'n days ago' or absolute date is shown
+for problems/updates. If a problem/update's `days_ago` value is <= this figure,
+the 'n days ago' format is used. By default the absolute date is always used.
+
+=cut
+sub display_days_ago_threshold { 0 }
+
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 7fa548406..2820719b9 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -165,4 +165,6 @@ sub user_extra_fields {
     return [ 'initials' ];
 }
 
+sub display_days_ago_threshold { 28 }
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index d78eda78f..4ccad3690 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -697,6 +697,20 @@ sub time_ago {
     return Utils::prettify_duration( $duration );
 }
 
+=head2 days_ago
+
+  Returns how many days ago a problem was reported.
+
+=cut
+
+sub days_ago {
+    my ( $self, $date ) = @_;
+    $date ||= 'confirmed';
+    my $now = DateTime->now( time_zone => FixMyStreet->time_zone || FixMyStreet->local_time_zone );
+    my $duration = $now->delta_days($self->$date);
+    return $duration->delta_days;
+}
+
 =head2 response_templates
 
 Returns all ResponseTemplates attached to this problem's bodies, in alphabetical
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 52213ed51..b942a5333 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -833,7 +833,6 @@ subtest 'get report time ago in appropriate format' => sub {
       confirmed => DateTime->now->subtract( years => 2 )
     } );
     is $problem->time_ago, '2 years', 'problem returns time ago in years';
-
 };
 
 subtest 'time ago works with other dates' => sub {
@@ -845,6 +844,20 @@ subtest 'time ago works with other dates' => sub {
     is $problem->time_ago('lastupdate'), '4 days', 'problem returns last updated time ago in days';
 };
 
+subtest 'return how many days ago a problem was reported' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $body_ids{2651}, 'TITLE');
+    $problem->update( {
+      confirmed => DateTime->now->subtract( weeks => 2  )
+    } );
+    is $problem->days_ago, 14, 'days_ago returns the amount of days';
+
+    $problem->update( {
+      lastupdate => DateTime->now->subtract( days => 4)
+    } );
+
+    is $problem->days_ago('lastupdate'), 4, 'days_ago allows other dates to be specified';
+};
+
 END {
     $problem->comments->delete if $problem;
     $problem->delete if $problem;
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index e233ff09f..a561c4c8d 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -45,13 +45,21 @@
                 <span class="item-list__item__state">[% problem.response_priority.name %]</span>
             [% END %]
             [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
-                [%- prettify_dt( problem.confirmed, 1 ) %]
+                [%- IF problem.days_ago > 0 AND problem.days_ago <= c.cobrand.display_days_ago_threshold %]
+                  [% tprintf( nget( loc('Reported %d day ago'), loc('Reported %d days ago'), problem.days_ago), problem.days_ago ) %]
+                [%- ELSE %]
+                  [% prettify_dt( problem.confirmed, 1 ) %]
+                [%- END %]
             [%- ELSE %] [%# Swedish cobrand fixamingata: %]
                 [%- prettify_dt( problem.confirmed) %]
             [%- END %]
             [%- IF dist %], [% dist %]km[% END %]
             [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
-                [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %]
+                [%- IF problem.days_ago('lastupdate') > 0 AND problem.days_ago('lastupdate') <= c.cobrand.display_days_ago_threshold %]
+                  [% tprintf(loc('last updated %s days ago'), problem.days_ago('lastupdate') ) %]
+                [%- ELSE %]
+                  [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) )  %]
+                [%- END %]
             [%- END %]
             [% IF include_sentinfo %]
                 [% IF c.cobrand.is_council && !c.cobrand.owns_problem( problem ) %]
-- 
cgit v1.2.3


From ec8bfae18fd70e5856919f935104297145b6e3a2 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 27 Feb 2017 14:28:33 +0000
Subject: =?UTF-8?q?Correct=20pluralise=20=E2=80=98days=20ago=E2=80=99=20on?=
 =?UTF-8?q?=20problem=20last=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/web/base/report/_item.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index a561c4c8d..712044592 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -56,7 +56,7 @@
             [%- IF dist %], [% dist %]km[% END %]
             [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [%- IF problem.days_ago('lastupdate') > 0 AND problem.days_ago('lastupdate') <= c.cobrand.display_days_ago_threshold %]
-                  [% tprintf(loc('last updated %s days ago'), problem.days_ago('lastupdate') ) %]
+                  [% tprintf( nget( loc('last updated %d day ago'), loc('last updated %d days ago'), problem.days_ago('lastupdate') ), problem.days_ago('lastupdate') ) %]
                 [%- ELSE %]
                   [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) )  %]
                 [%- END %]
-- 
cgit v1.2.3


From bb0473577998ff275a3f28b279a74948dc2ef044 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Feb 2017 13:23:35 +0000
Subject: Do not re-stat non-existent files.

The versioning code wasn't remembering when it had found that a file did
not exist, so was checking for them each time.
---
 perllib/FixMyStreet/App/View/Web.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index b73fa82ef..496463700 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -155,7 +155,7 @@ sub version {
 
 sub _version_get_mtime {
     my $file = shift;
-    unless ($version_hash{$file} && !FixMyStreet->config('STAGING_SITE')) {
+    unless (defined $version_hash{$file} && !FixMyStreet->config('STAGING_SITE')) {
         my $path = FixMyStreet->path_to('web', $file);
         $version_hash{$file} = ( stat( $path ) )[9] || 0;
     }
-- 
cgit v1.2.3


From 7ecd4513cc9703fa27b1f521a1fc443cc9a3ca33 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Feb 2017 13:24:13 +0000
Subject: Assume photo ID given in database exists on disk.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The list code was checking the photo ID given in the database existed on
disk – this shouldn't ever not be the case, and if it was, all that
would happen would be a broken image when the full photo code looks for
it (this is only for e.g. lists of reports).
---
 perllib/FixMyStreet/App/Model/PhotoSet.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 46e1fb630..04521b5ce 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -191,12 +191,7 @@ has ids => ( #  Arrayref of $fileid tuples (always, so post upload/raw data proc
             $type ||= 'jpeg';
             if ($fileid && length($fileid) == 40) {
                 my $file = $self->get_file($fileid, $type);
-                if ($file->exists) {
-                    $file->basename;
-                } else {
-                    warn "File $part doesn't exist";
-                    ();
-                }
+                $file->basename;
             } else {
                 # A bad hash, probably a bot spamming with bad data.
                 ();
-- 
cgit v1.2.3


From d830c40740b24537477627e0923c13f3b9ff6099 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 28 Feb 2017 15:32:22 +0000
Subject: Only output appcache/manifest for shortlist users.

The interception of 404s etc is too much of an inconvenience.
---
 perllib/FixMyStreet/App/Controller/Offline.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Offline.pm b/perllib/FixMyStreet/App/Controller/Offline.pm
index 5f3b69f2e..dceccc81f 100644
--- a/perllib/FixMyStreet/App/Controller/Offline.pm
+++ b/perllib/FixMyStreet/App/Controller/Offline.pm
@@ -17,9 +17,15 @@ On staging site, appcache only for people who want it.
 
 =cut
 
+sub have_appcache : Private {
+    my ($self, $c) = @_;
+    return $c->user_exists && $c->user->has_body_permission_to('planned_reports')
+        && !FixMyStreet->staging_flag('enable_appcache', 0);
+}
+
 sub manifest : Path("/offline/appcache.manifest") {
     my ($self, $c) = @_;
-    if (FixMyStreet->staging_flag('enable_appcache', 0)) {
+    unless ($c->forward('have_appcache')) {
         $c->response->status(404);
         $c->response->body('NOT FOUND');
     }
@@ -30,7 +36,7 @@ sub manifest : Path("/offline/appcache.manifest") {
 sub appcache : Path("/offline/appcache") {
     my ($self, $c) = @_;
     $c->detach('/page_error_404_not_found', []) if keys %{$c->req->params};
-    if (FixMyStreet->staging_flag('enable_appcache', 0)) {
+    unless ($c->forward('have_appcache')) {
         $c->response->status(404);
         $c->response->body('NOT FOUND');
     }
-- 
cgit v1.2.3


From ca8a8d172f00fb0b032968c5cd1df82486cdc9b9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 28 Feb 2017 18:05:56 +0000
Subject: Fix placeholder typo in French translation.

---
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4c28d86d9..f45867ab4 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -1811,7 +1811,7 @@ msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré a
 #: perllib/FixMyStreet/Cobrand/Default.pm:527
 #: perllib/FixMyStreet/Cobrand/Default.pm:567
 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%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:323
 msgid ""
-- 
cgit v1.2.3


From e769354e7314e4db2998f4a282ddf4cfd4030a59 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Wed, 1 Mar 2017 13:12:01 +0000
Subject: Add buttons to resize maps on report pages

This improves usability on mobile devices, allowing users to pan around
the problem and see the area in more detail.

I've also changed the CSS around a bit, so we can use the
`map-fullscreen` class in other places.
---
 templates/web/base/common_header_tags.html      |   2 +-
 templates/web/base/js/translation_strings.html  |   3 ++
 web/cobrands/fixmystreet/fixmystreet.js         |  17 +++++++-
 web/cobrands/fixmystreet/header.js              |   2 +-
 web/cobrands/fixmystreet/images/compress.png    | Bin 0 -> 762 bytes
 web/cobrands/fixmystreet/images/compress.svg    |   1 +
 web/cobrands/fixmystreet/images/compress@2x.png | Bin 0 -> 1227 bytes
 web/cobrands/fixmystreet/images/expand.png      | Bin 0 -> 726 bytes
 web/cobrands/fixmystreet/images/expand.svg      |   1 +
 web/cobrands/fixmystreet/images/expand@2x.png   | Bin 0 -> 1112 bytes
 web/cobrands/sass/_base.scss                    |  53 ++++++++++++++++++++----
 11 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 web/cobrands/fixmystreet/images/compress.png
 create mode 100644 web/cobrands/fixmystreet/images/compress.svg
 create mode 100644 web/cobrands/fixmystreet/images/compress@2x.png
 create mode 100644 web/cobrands/fixmystreet/images/expand.png
 create mode 100644 web/cobrands/fixmystreet/images/expand.svg
 create mode 100644 web/cobrands/fixmystreet/images/expand@2x.png

diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 7c0ac4973..e64722f01 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -12,7 +12,7 @@
 <script nonce="[% csp_nonce %]">
     window.Modernizr=function(e,t,n){function r(e){p.cssText=e}function o(e,t){return typeof e===t}var a,i,c,l="2.8.3",s={},u=t.documentElement,d="modernizr",f=t.createElement(d),p=f.style,m=({}.toString,{}),h=[],y=h.slice,v=function(e,n,r,o){var a,i,c,l,s=t.createElement("div"),f=t.body,p=f||t.createElement("body");if(parseInt(r,10))for(;r--;)c=t.createElement("div"),c.id=o?o[r]:d+(r+1),s.appendChild(c);return a=["&#173;",'<style id="s',d,'">',e,"</style>"].join(""),s.id=d,(f?s:p).innerHTML+=a,p.appendChild(s),f||(p.style.background="",p.style.overflow="hidden",l=u.style.overflow,u.style.overflow="hidden",u.appendChild(p)),i=n(s,e),f?s.parentNode.removeChild(s):(p.parentNode.removeChild(p),u.style.overflow=l),!!i},g=function(t){var n=e.matchMedia||e.msMatchMedia;if(n)return n(t)&&n(t).matches||!1;var r;return v("@media "+t+" { #"+d+" { position: absolute; } }",function(t){r="absolute"==(e.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position}),r},b={}.hasOwnProperty;c=o(b,"undefined")||o(b.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(e,t){return b.call(e,t)};for(var E in m)c(m,E)&&(i=E.toLowerCase(),s[i]=m[E](),h.push((s[i]?"":"no-")+i));return r(""),f=a=null,s._version=l,s.mq=g,s.testStyles=v,s}(this,this.document);
     var fixmystreet=fixmystreet||{};
-    (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8"),c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" mobile-reporting-map only-map"))})(document);
+    (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8"),c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" map-fullscreen only-map map-reporting"))})(document);
 </script>
 
 [% IF admin %]
diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index d6aca9ccb..c09609411 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -46,6 +46,9 @@
         map_map: '[% loc('Map') | replace("'", "\\'") %]',
         map_satellite: '[% loc('Satellite') | replace("'", "\\'") %]',
 
+        expand_map: '[% loc('Expand map') | replace("'", "\\'") %]',
+        collapse_map: '[% loc('Collapse map') | replace("'", "\\'") %]',
+
         permalink: '[% loc('Permalink') | replace("'", "\\'") %]',
 
         upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]',
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 313d790c9..8e8941421 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -118,7 +118,7 @@ fixmystreet.mobile_reporting = {
   apply_ui: function() {
     // Creates the "app-like" mobile reporting UI with full screen map
     // and special "OK/Cancel" buttons etc.
-    $('html').addClass('mobile-reporting-map only-map');
+    $('html').addClass('map-fullscreen only-map map-reporting');
     $('.mobile-map-banner span').text(translation_strings.place_pin_on_map);
     $('html, body').scrollTop(0);
   },
@@ -126,7 +126,7 @@ fixmystreet.mobile_reporting = {
   remove_ui: function() {
     // Removes the "app-like" mobile reporting UI, reverting all the
     // changes made by fixmystreet.mobile_reporting.apply_ui().
-    $('html').removeClass('mobile-reporting-map only-map');
+    $('html').removeClass('map-fullscreen only-map map-reporting');
     $('#map_box').css({ width: "", height: "", position: "" });
     $('#mob_sub_map_links').remove();
   }
@@ -869,6 +869,9 @@ $.extend(fixmystreet.set_up, {
         }
         $('#key-tools li:empty').remove();
         $('#report-updates-data').insertAfter($('#map_box'));
+        if (fixmystreet.page === 'report' || fixmystreet.page === 'reports') {
+            $('#sub_map_links').append('<a href="#" id="toggle-fullscreen" class="expand" data-expand-text="'+ translation_strings.expand_map +'" data-compress-text="'+ translation_strings.collapse_map +'" >'+ translation_strings.expand_map +'</span>');
+        }
     }
 
     // Show/hide depending on whether it has any children to show
@@ -897,6 +900,16 @@ $.extend(fixmystreet.set_up, {
             })
             .prependTo('#sub_map_links');
     }
+
+    $('#toggle-fullscreen').click(function() {
+      var btnClass = $('html').hasClass('map-fullscreen') ? 'expand' : 'compress';
+      var text = $(this).data(btnClass + '-text');
+
+      $('html').toggleClass('map-fullscreen only-map');
+      $(this).html(text).attr('class', btnClass);
+
+      fixmystreet.map.updateSize();
+    });
   },
 
   map_sidebar_key_tools: function() {
diff --git a/web/cobrands/fixmystreet/header.js b/web/cobrands/fixmystreet/header.js
index c4c3de1b6..e4b0a9a91 100644
--- a/web/cobrands/fixmystreet/header.js
+++ b/web/cobrands/fixmystreet/header.js
@@ -13,7 +13,7 @@ var fixmystreet = fixmystreet || {};
     if (type == 'mobile') {
         E.className += ' mobile';
         if (fixmystreet.page == 'around') {
-            E.className += ' mobile-reporting-map only-map';
+            E.className += ' map-fullscreen only-map map-reporting';
         }
     }
 })(document);
diff --git a/web/cobrands/fixmystreet/images/compress.png b/web/cobrands/fixmystreet/images/compress.png
new file mode 100644
index 000000000..500673956
Binary files /dev/null and b/web/cobrands/fixmystreet/images/compress.png differ
diff --git a/web/cobrands/fixmystreet/images/compress.svg b/web/cobrands/fixmystreet/images/compress.svg
new file mode 100644
index 000000000..68efd6b31
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/compress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="384" height="448" viewBox="0 0 384 448"><path fill="#fff" d="M192 240v112c0 8.75-7.25 16-16 16-4.25 0-8.25-1.75-11.25-4.75l-36-36-83 83c-1.5 1.5-3.75 2.5-5.75 2.5s-4.25-1-5.75-2.5l-28.5-28.5c-1.5-1.5-2.5-3.75-2.5-5.75s1-4.25 2.5-5.75l83-83-36-36c-3-3-4.75-7-4.75-11.25 0-8.75 7.25-16 16-16h112c8.75 0 16 7.25 16 16zM380.75 72c0 2-1 4.25-2.5 5.75l-83 83 36 36c3 3 4.75 7 4.75 11.25 0 8.75-7.25 16-16 16H208c-8.75 0-16-7.25-16-16V96c0-8.75 7.25-16 16-16 4.25 0 8.25 1.75 11.25 4.75l36 36 83-83c1.5-1.5 3.75-2.5 5.75-2.5s4.25 1 5.75 2.5l28.5 28.5c1.5 1.5 2.5 3.75 2.5 5.75z"/></svg>
diff --git a/web/cobrands/fixmystreet/images/compress@2x.png b/web/cobrands/fixmystreet/images/compress@2x.png
new file mode 100644
index 000000000..8acf34850
Binary files /dev/null and b/web/cobrands/fixmystreet/images/compress@2x.png differ
diff --git a/web/cobrands/fixmystreet/images/expand.png b/web/cobrands/fixmystreet/images/expand.png
new file mode 100644
index 000000000..c0c129fb7
Binary files /dev/null and b/web/cobrands/fixmystreet/images/expand.png differ
diff --git a/web/cobrands/fixmystreet/images/expand.svg b/web/cobrands/fixmystreet/images/expand.svg
new file mode 100644
index 000000000..1f063b4b7
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/expand.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="384" height="448" viewBox="0 0 384 448"><path fill="#fff" d="M188.75 264c0 2-1 4.25-2.5 5.75l-83 83 36 36c3 3 4.75 7 4.75 11.25 0 8.75-7.25 16-16 16H16c-8.75 0-16-7.25-16-16V288c0-8.75 7.25-16 16-16 4.25 0 8.25 1.75 11.25 4.75l36 36 83-83c1.5-1.5 3.75-2.5 5.75-2.5s4.25 1 5.75 2.5l28.5 28.5c1.5 1.5 2.5 3.75 2.5 5.75zM384 48v112c0 8.75-7.25 16-16 16-4.25 0-8.25-1.75-11.25-4.75l-36-36-83 83c-1.5 1.5-3.75 2.5-5.75 2.5s-4.25-1-5.75-2.5l-28.5-28.5c-1.5-1.5-2.5-3.75-2.5-5.75s1-4.25 2.5-5.75l83-83-36-36c-3-3-4.75-7-4.75-11.25 0-8.75 7.25-16 16-16h112c8.75 0 16 7.25 16 16z"/></svg>
diff --git a/web/cobrands/fixmystreet/images/expand@2x.png b/web/cobrands/fixmystreet/images/expand@2x.png
new file mode 100644
index 000000000..6abc9c1a4
Binary files /dev/null and b/web/cobrands/fixmystreet/images/expand@2x.png differ
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 179168aae..366939d4c 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -620,6 +620,7 @@ body.mappage .wrapper {
           background-image: url($image-sprite);
           background-position: center -2563px;
         }
+
         &.share {
           background-image: url('/cobrands/fixmystreet/images/share.png');
           background-position: center 25%;
@@ -1496,6 +1497,40 @@ html.js #map .noscript {
       background-image:url($image-sprite);
       background-position: flip(right, -341px) -3936px;
     }
+    &#toggle-fullscreen {
+      padding: 0.6em 1em 0.5em 1em;
+      &:after {
+        content: "";
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        background-size: 16px 16px;
+        vertical-align: middle;
+        margin-#{$left}: 8px;
+      }
+      &.expand:after {
+        background-image: url(/cobrands/fixmystreet/images/expand.png);
+
+        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+            background-image: url(/cobrands/fixmystreet/images/expand@2x.png);
+        }
+
+        @media all {
+            background-image: url(/cobrands/fixmystreet/images/expand.svg), none;
+        }
+      }
+      &.compress:after {
+        background-image: url(/cobrands/fixmystreet/images/compress.png);
+
+        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+            background-image: url(/cobrands/fixmystreet/images/compress@2x.png);
+        }
+
+        @media all {
+            background-image: url(/cobrands/fixmystreet/images/compress.svg), none;
+        }
+      }
+    }
     &:hover {
       background-color:#000;
       text-decoration:none;
@@ -1559,14 +1594,14 @@ html.js #map .noscript {
   text-transform: uppercase;
   text-align: center;
   font-size: 0.875em;
-  .mobile-reporting-map & {
+  .map-fullscreen & {
     display: none;
   }
 }
 
 .mobile-map-banner {
   display: none;
-  .mobile-reporting-map & {
+  .map-fullscreen & {
     display: block;
   }
   text-transform: uppercase;
@@ -1656,7 +1691,7 @@ a:hover.rap-notes-trigger {
 // and make the map full screen to reduce distractions. JavaScript also
 // tweaks the text content of some of the map-related elements, to make
 // it more "app-like".
-.mobile-reporting-map {
+.map-fullscreen {
   #site-header {
     display: none;
   }
@@ -1672,10 +1707,6 @@ a:hover.rap-notes-trigger {
     z-index: 1; // stack above positioned elements later on the page (eg: .report-list-filters)
   }
 
-  #fms_pan_zoom {
-    top: 2.75em; // make space for the semi-transparent "Place pin on map" bar
-  }
-
   .container {
     padding: 0; // map_box needs to be full width, so remove page gutter
   }
@@ -1685,7 +1716,13 @@ a:hover.rap-notes-trigger {
   }
 }
 
-.mobile-reporting-map.only-map {
+.map-reporting {
+  #fms_pan_zoom {
+    top: 2.75em; // make space for the semi-transparent "Place pin on map" bar
+  }
+}
+
+.only-map {
   height: 100%;
   body {
     height: 100%;
-- 
cgit v1.2.3


From 6cdd349cc527cff6f7cef9bed6918fda5a375098 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Thu, 16 Feb 2017 16:46:41 +0000
Subject: [fixmystreet.com] Clarify council contact form.

* Tweak wording to make it clearer that the form is unsuitable
  for residents wanting to report street problems.
* Record HTTP Referer when form is submitted, so we can see
  which pages are leading people to the FMS4C page.
* Tidy up capitalisation elsewhere in headings on the page.

Fixes #1553.
---
 templates/web/fixmystreet.com/about/council.html | 41 ++++++++++++------------
 web/cobrands/fixmystreet.com/fmsforcouncils.scss |  7 +++-
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/templates/web/fixmystreet.com/about/council.html b/templates/web/fixmystreet.com/about/council.html
index 5419f6c11..5abbbb2ef 100644
--- a/templates/web/fixmystreet.com/about/council.html
+++ b/templates/web/fixmystreet.com/about/council.html
@@ -27,7 +27,7 @@
       <div class="councils-features__grid">
         <div class="councils-features__feature">
           <div class="councils-features__thumb councils-features__thumb--excellence"></div>
-          <h3>Digital Excellence</h3>
+          <h3>Digital excellence</h3>
           <p>FixMyStreet was co-designed with council insiders. We made it into the most user-centred, accessible approach to non-emergency issue reporting available today. And now it’s the leader in its class.</p>
         </div>
         <div class="councils-features__feature">
@@ -114,7 +114,7 @@
       <h2>Works with</h2>
       <div class="councils-compatibility__grid">
         <div class="councils-compatibility__item">
-          <h3>Customer Management</h3>
+          <h3>Customer management</h3>
           <ul>
             <li><a href="http://www.kana.com/lagan-crm/customer-experience-management">Lagan</a></li>
             <li><a href="https://www.microsoft.com/en-gb/dynamics/default.aspx">Microsoft Dynamics</a></li>
@@ -149,12 +149,12 @@
 
           <div class="pricing-table">
             <div class="pricing-table__item">
-              <h3>Simple fault reporting</h3>
+              <h3>Basic FixMyStreet integration</h3>
               <p class="pricing-table__item__price"><strong>&pound;7,500 per year</strong></p>
               <p>The award-winning FixMyStreet experience seamlessly integrated with your site. A responsive web application for reporting, viewing and discussing problems - branded to match your site’s styles and templates. Use FixMyStreet for Councils to keep your residents up to date and route problems by email to the correct individual or team. The internal dashboard eanbles you to manage performance.</p>
             </div>
             <div class="pricing-table__item">
-              <h3>Case&hyphen;management Integration</h3>
+              <h3>Case&hyphen;management integration</h3>
               <p class="pricing-table__item__price"><strong>&pound;15,000 per year</strong></p>
               <p>Our award-winning reporting solution &ndash; your existing processes and systems. We’ll integrate FixMyStreet into your customer, case or asset management system ensuring that there’s minimal impact on your organisation. Accept reports, automatically publish updates and reports from other channels via your existing tools, directly onto FixMyStreet.</p>
               <p>Supported services include: Confirm, Mayrise, MS Dynamics and Exor. If you use an alternative service or your own internal system we’ll scope and implement additional support via our Specialist Cloud Service.</p>
@@ -180,14 +180,14 @@
             <h3>Bring your own, or we can provide</h3>
             <div class="pricing-accordion accordion">
               <div class="accordion-item">
-                <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom Map Tiles</h4></a>
+                <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom map tiles</h4></a>
                 <div class="accordion-content">
                   <p class="extra-pricing__price">&pound;1,500 per year</p>
                   <p class="extra-pricing__desc">FixMyStreet comes with OpenStreetMap/Bing geographical base maps as standard. But for a completely unique look, or to key in with your existing mapping visuals, we can support the industry standard WMS maps of your choice.</p>
                 </div>
               </div>
               <div class="accordion-item">
-                <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom Geocoding</h4></a>
+                <a href="#" class="accordion-switch accordion-switch--closed"><h4>Custom geocoding</h4></a>
                 <div class="accordion-content">
                   <p class="extra-pricing__price">&pound;1,500 per year</p>
                   <p class="extra-pricing__desc">Transforming an address into a point on a map: it’s called geocoding, and we utilise Bing, OpenStreetMap and Google’s services as standard. But if you have your own geocoding system, we can integrate that to ensure a precise location for a given postcode, address or place name.</p>
@@ -223,9 +223,22 @@
 
 <div class="council-order" id="order">
   <div class="councils-content-wrapper">
-    <h2>Order</h2>
+    <h2>Request a free demo</h2>
     <form action="/contact/submit" method="post">
     <div class="council-order__form">
+      <div class="form-group">
+        <label for="product">We are interested in&hellip;</label>
+        <span class="required">required</span>
+        <div class="radio-as-buttons">
+          <label><input name="extra.product" id="product" type="radio" value="simple-fault-reporting" required>Basic FixMyStreet integration <span class="council-order__form__product__price">&pound;7,500 per year</span></label>
+          <label><input name="extra.product" id="product" type="radio" value="case-management-integration">Case-management integration <span class="council-order__form__product__price">&pound;15,000 per year</span></label>
+          <label><input name="extra.product" id="product" type="radio" value="top-to-bottom-case-management">Top-to-bottom case-management <span class="council-order__form__product__price">&pound;35,000 per year</span></label>
+        </div>
+      </div>
+      <div class="form-group">
+        <label for="message">A little more about your requirements</label>
+        <textarea name="message" id="message" required> </textarea>
+      </div>
       <div class="form-group">
         <label for="name">Name</label>
         <span class="required">required</span>
@@ -245,20 +258,8 @@
         <label for="phone">Contact telephone</label>
         <input type="tel" name="extra.phone" id="phone">
       </div>
-      <div class="form-group">
-        <label for="product">Product</label>
-        <span class="required">required</span>
-        <div class="radio-as-buttons">
-          <label><input name="extra.product" id="product" type="radio" value="simple-fault-reporting" required>Simple fault reporting</label>
-          <label><input name="extra.product" id="product" type="radio" value="case-management-integration">Case-management integration</label>
-          <label><input name="extra.product" id="product" type="radio" value="top-to-bottom-case-management">Top-to-bottom case-management</label>
-        </div>
-      </div>
-      <div class="form-group">
-        <label for="message">Message</label>
-        <textarea name="message" id="message" required> </textarea>
-      </div>
       <div class="form-group submit-group">
+        <input type="hidden" name="extra.referer" value="[% c.req.headers.referer | html %]">
         <input type="hidden" name="subject" value="Councils submission">
         <input type="hidden" name="recipient" value="enquiries">
         <input type="hidden" name="dest" value="from_council">
diff --git a/web/cobrands/fixmystreet.com/fmsforcouncils.scss b/web/cobrands/fixmystreet.com/fmsforcouncils.scss
index 49b294eac..d2d2182f8 100644
--- a/web/cobrands/fixmystreet.com/fmsforcouncils.scss
+++ b/web/cobrands/fixmystreet.com/fmsforcouncils.scss
@@ -559,7 +559,7 @@ $fms-green: #62b356;
       font-weight: normal;
     }
     textarea {
-      height: 15em;
+      height: 10em;
     }
     textarea,
     input[type="text"],
@@ -591,6 +591,11 @@ $fms-green: #62b356;
     }
   }
 
+  .council-order__form__product__price {
+      margin-left: 0.5em;
+      color: #999;
+  }
+
   .form-group {
     position: relative;
     @media (min-width: 44em) {
-- 
cgit v1.2.3


From 9c797fab51a7e8d06bfc4d768e52e664e53ecf9f Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Thu, 16 Feb 2017 16:47:36 +0000
Subject: [fixmystreet.com] Avoid /about/council redirects.

---
 templates/email/default/submit-example.txt                | 2 +-
 templates/email/fixmystreet.com/_submit_footer.html       | 2 +-
 templates/email/fixmystreet.com/submit.txt                | 2 +-
 templates/web/base/open311/index.html                     | 2 +-
 templates/web/bromley/front/footer-marketing.html         | 4 ++--
 templates/web/fixmystreet.com/footer_extra.html           | 2 +-
 templates/web/fixmystreet.com/front/footer-marketing.html | 2 +-
 templates/web/fixmystreet.com/reports/_extras.html        | 2 +-
 templates/web/greenwich/front/footer-marketing.html       | 2 +-
 templates/web/hart/footer.html                            | 2 +-
 templates/web/oxfordshire/footer.html                     | 2 +-
 templates/web/stevenage/footer.html                       | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt
index 7fa0a23da..c4ae6704f 100644
--- a/templates/email/default/submit-example.txt
+++ b/templates/email/default/submit-example.txt
@@ -55,5 +55,5 @@ feedback you may have.
 
 FixMyStreet is now available for full integration into council
 websites, making life easier for both you and your residents.
-Read more here: https://www.fixmystreet.com/council
+Read more here: https://www.fixmystreet.com/about/council
 
diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html
index b76f128a5..40118bc9a 100644
--- a/templates/email/fixmystreet.com/_submit_footer.html
+++ b/templates/email/fixmystreet.com/_submit_footer.html
@@ -6,4 +6,4 @@ welcome any other feedback you may have.
 <br><br>
 FixMyStreet is now available for full integration into council websites, making
 life easier for both you and your residents.
-<a href="https://www.fixmystreet.com/council">Read more</a>
+<a href="https://www.fixmystreet.com/about/council">Read more</a>
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index c30244db9..8d658e4f2 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -47,5 +47,5 @@ also welcome any other feedback you may have.
 
 FixMyStreet is now available for full integration into council
 websites, making life easier for both you and your residents.
-Read more here: https://www.fixmystreet.com/council
+Read more here: https://www.fixmystreet.com/about/council
 
diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html
index 558c14ca5..51e7ef364 100644
--- a/templates/web/base/open311/index.html
+++ b/templates/web/base/open311/index.html
@@ -40,7 +40,7 @@ about future-proofing your communication channels in an easy and economical way
 
 [% IF c.cobrand.moniker == 'fixmystreet' %]
 <p>You may be interested to know about <a
-href="https://www.fixmystreet.com/council">FixMyStreet
+href="https://www.fixmystreet.com/about/council">FixMyStreet
 for Councils</a>, our hosted service which sits seamlessly on your council
 website.</p>
 
diff --git a/templates/web/bromley/front/footer-marketing.html b/templates/web/bromley/front/footer-marketing.html
index bdbe16dfb..34611a1b4 100644
--- a/templates/web/bromley/front/footer-marketing.html
+++ b/templates/web/bromley/front/footer-marketing.html
@@ -12,7 +12,7 @@
 
     <div id="footer-help">
         <p>
-        Powered by <a class="platform-logo" href="https://fixmystreet.com/council">FixMyStreet Platform</a>
+        Powered by <a class="platform-logo" href="https://fixmystreet.com/about/council">FixMyStreet Platform</a>
         </p>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html
index d4e7b38a3..e16198bb1 100644
--- a/templates/web/fixmystreet.com/footer_extra.html
+++ b/templates/web/fixmystreet.com/footer_extra.html
@@ -31,7 +31,7 @@
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>
                     </ul>
                     <ul>
-                        <li><a href="https://www.fixmystreet.com/council">FixMyStreet for Councils</a></li>
+                        <li><a href="/about/council">FixMyStreet for Councils</a></li>
                         <li><[% IF c.req.uri.path == '/posters' %]span[% ELSE %]a href="[% base %]/posters"[% END
                             %]>[% loc("FixMyStreet Goodies") %]</[% c.req.uri.path == '/posters' ? 'span' : 'a' %]></li>
                         <li><[% IF c.req.uri.path == '/contact' %]span[% ELSE %]a href="[% base %]/contact"[% END
diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html
index 74516b8be..2095b51c5 100644
--- a/templates/web/fixmystreet.com/front/footer-marketing.html
+++ b/templates/web/fixmystreet.com/front/footer-marketing.html
@@ -7,7 +7,7 @@
                                     </li>
                                     <li>
                                         <h4>[% loc('Are you from a council?') %]</h4>
-                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/council">Find out about FixMyStreet for councils</a>.') %]</p>
+                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="/about/council">Find out about FixMyStreet for councils</a>.') %]</p>
                                     </li>
                                 </ul>
                             </div>
diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html
index 824fec3ec..77c2cecdf 100755
--- a/templates/web/fixmystreet.com/reports/_extras.html
+++ b/templates/web/fixmystreet.com/reports/_extras.html
@@ -25,7 +25,7 @@
 <td class="title" colspan="6" style="padding-top:0">
     <small title="This council's online reporting is powered by FixMyStreet">(includes reports from
     <a href="http[% secure.$site %]://[% site %]">[% site %]</a> using
-    <a href="https://www.fixmystreet.com/council">FixMyStreet for Councils</a>)</small>
+    <a href="/about/council">FixMyStreet for Councils</a>)</small>
 </td>
 </tr>
 [% END %]
diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html
index 66a75b5cc..bf08a11dd 100644
--- a/templates/web/greenwich/front/footer-marketing.html
+++ b/templates/web/greenwich/front/footer-marketing.html
@@ -13,7 +13,7 @@
 
     <div id="footer-help">
         <p>
-        Powered by <a class="platform-logo" href="https://fixmystreet.com/council">FixMyStreet Platform</a>
+        Powered by <a class="platform-logo" href="https://fixmystreet.com/about/council">FixMyStreet Platform</a>
         </p>
     </div>
 </div>
diff --git a/templates/web/hart/footer.html b/templates/web/hart/footer.html
index ce0ae3844..e1b013032 100644
--- a/templates/web/hart/footer.html
+++ b/templates/web/hart/footer.html
@@ -66,7 +66,7 @@
                 </footer>
                 <div class="clearfix" id="footer-row-2">
                     <div id="hart-powered-by">
-                        <a href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
+                        <a href="https://www.fixmystreet.com/about/council">Powered by <img src="/cobrands/hart/fms-logo.png" alt="FixMyStreet" style="height:20px;"></a>
                     </div>
                     <div id="footer-images">
                         <a href="https://twitter.com/HartCouncil">
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index 5f117cfd3..dd90cab01 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -11,7 +11,7 @@
             <div class="nav-wrapper-2">
                 <div id="main-nav" role="navigation">
                     <ul class="nav-menu nav-menu--mysoc">
-                        <li><a id="mysoc-logo" href="https://www.fixmystreet.com/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
+                        <li><a id="mysoc-logo" href="https://www.fixmystreet.com/about/council">Powered by <img src="/cobrands/oxfordshire/images/fms-logo-105x20.png" alt="FixMyStreet"></a></li>
                     </ul>
 
                     [% INCLUDE "main_nav.html" body_name=c.cobrand.council_area hide_mysoc_link=1 omit_wrapper=1 hide_privacy_link=1 %]
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index 215ca0eab..ee0fc15d5 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -19,7 +19,7 @@
                                     </li>
                                     <li>
                                         <h4>[% loc('Are you from a council?') %]</h4>
-                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/council">Find out about FixMyStreet for councils</a>.') %]</p>
+                                        <p>[% loc('Would you like better integration with FixMyStreet? <a href="https://www.fixmystreet.com/about/council">Find out about FixMyStreet for councils</a>.') %]</p>
                                     </li>
                                 </ul>
                             </div>
-- 
cgit v1.2.3


From 8c5f462c2215446df04503e4da4cd40e0b01ec59 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 Mar 2017 11:24:56 +0000
Subject: Bring changelog up to date.

---
 README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/README.md b/README.md
index 33eec1832..657629f00 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,27 @@ web-based cross-browser testing tools for this project.
 
 ## Releases
 
+* In development
+    - Front end improvements:
+        - Add ability to make map full screen on mobile report pages. #1655
+        - Allow users to reopen closed reports. #1607
+    - Admin improvements:
+        - Redirect to category-filtered /reports on login if present. #1622
+        - Follow redirect to /admin after login if allowed. #1622
+        - Include /admin link on top-level nav for admin users.
+        - Add shortlist filters. #1629
+    - Bugfixes:
+        - Fix crash on reports with empty `bodies_str`. #1635
+        - Only output appcache/manifest for shortlist users. #1653
+        - Fix placeholder typo in French translation.
+    - Development improvements:
+        - Send open reports regardless of current state. #1334
+        - Clarify ‘inspected’ behaviour. #1614
+        - Reduce disk stats. #1647
+        - Refactor main navigation into reusable blocks.
+        - Add Problem->time_ago for pretty-printed duration.
+        - Add `external_id` field to ResponsePriority.
+
 * v2.0.2 (3rd February 2017)
     - Front end changes:
         - Add an offline fallback page with appcache. #1588
-- 
cgit v1.2.3


From c0b5775a599cfda73bb378d43ddc274f9522ddcf Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 9 Mar 2017 10:33:09 +0000
Subject: Make sure emails are lowercased in admin.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 31 +++++++++++++----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index a7b9fb169..2a5b3600b 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -789,11 +789,9 @@ sub report_edit : Path('report_edit') : Args(1) {
 
         $c->forward( '/admin/report_edit_category', [ $problem ] );
 
-        if ( $c->get_param('email') ne $problem->user->email ) {
-            my $user = $c->model('DB::User')->find_or_create(
-                { email => $c->get_param('email') }
-            );
-
+        my $email = lc $c->get_param('email');
+        if ( $email ne $problem->user->email ) {
+            my $user = $c->model('DB::User')->find_or_create({ email => $email });
             $user->insert unless $user->in_storage;
             $problem->user( $user );
         }
@@ -1117,8 +1115,9 @@ sub update_edit : Path('update_edit') : Args(1) {
         # $update->name can be null which makes ne unhappy
         my $name = $update->name || '';
 
+        my $email = lc $c->get_param('email');
         if ( $c->get_param('name') ne $name
-          || $c->get_param('email') ne $update->user->email
+          || $email ne $update->user->email
           || $c->get_param('anonymous') ne $update->anonymous
           || $c->get_param('text') ne $update->text ) {
               $edited = 1;
@@ -1138,11 +1137,8 @@ sub update_edit : Path('update_edit') : Args(1) {
         $update->anonymous( $c->get_param('anonymous') );
         $update->state( $new_state );
 
-        if ( $c->get_param('email') ne $update->user->email ) {
-            my $user =
-              $c->model('DB::User')
-              ->find_or_create( { email => $c->get_param('email') } );
-
+        if ( $email ne $update->user->email ) {
+            my $user = $c->model('DB::User')->find_or_create({ email => $email });
             $user->insert unless $user->in_storage;
             $update->user($user);
         }
@@ -1207,7 +1203,7 @@ sub user_add : Path('user_edit') : Args(0) {
 
     my $user = $c->model('DB::User')->find_or_create( {
         name => $c->get_param('name'),
-        email => $c->get_param('email'),
+        email => lc $c->get_param('email'),
         phone => $c->get_param('phone') || undef,
         from_body => $c->get_param('body') || undef,
         flagged => $c->get_param('flagged') || 0,
@@ -1257,7 +1253,8 @@ sub user_edit : Path('user_edit') : Args(1) {
 
         my $edited = 0;
 
-        if ( $user->email ne $c->get_param('email') ||
+        my $email = lc $c->get_param('email');
+        if ( $user->email ne $email ||
             $user->name ne $c->get_param('name') ||
             ($user->phone || "") ne $c->get_param('phone') ||
             ($user->from_body && $c->get_param('body') && $user->from_body->id ne $c->get_param('body')) ||
@@ -1267,7 +1264,7 @@ sub user_edit : Path('user_edit') : Args(1) {
         }
 
         $user->name( $c->get_param('name') );
-        $user->email( $c->get_param('email') );
+        $user->email( $email );
         $user->phone( $c->get_param('phone') ) if $c->get_param('phone');
         $user->flagged( $c->get_param('flagged') || 0 );
         # Only superusers can grant superuser status
@@ -1627,7 +1624,7 @@ accordingly
 sub ban_user : Private {
     my ( $self, $c ) = @_;
 
-    my $email = $c->get_param('email');
+    my $email = lc $c->get_param('email');
 
     return unless $email;
 
@@ -1654,7 +1651,7 @@ Sets the flag on a user with the given email
 sub flag_user : Private {
     my ( $self, $c ) = @_;
 
-    my $email = $c->get_param('email');
+    my $email = lc $c->get_param('email');
 
     return unless $email;
 
@@ -1682,7 +1679,7 @@ Remove the flag on a user with the given email
 sub remove_user_flag : Private {
     my ( $self, $c ) = @_;
 
-    my $email = $c->get_param('email');
+    my $email = lc $c->get_param('email');
 
     return unless $email;
 
-- 
cgit v1.2.3


From 286b4cb512c1e2d8c817318a2f082191efb39625 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 9 Mar 2017 10:33:42 +0000
Subject: Check cobrand users list when admin merging users.

---
 perllib/FixMyStreet/App/Controller/Admin.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 2a5b3600b..87a4191af 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1264,6 +1264,7 @@ sub user_edit : Path('user_edit') : Args(1) {
         }
 
         $user->name( $c->get_param('name') );
+        my $original_email = $user->email;
         $user->email( $email );
         $user->phone( $c->get_param('phone') ) if $c->get_param('phone');
         $user->flagged( $c->get_param('flagged') || 0 );
@@ -1365,11 +1366,17 @@ sub user_edit : Path('user_edit') : Args(1) {
         return if %{$c->stash->{field_errors}};
 
         my $existing_user = $c->model('DB::User')->search({ email => $user->email, id => { '!=', $user->id } })->first;
-        if ($existing_user) {
+        my $existing_user_cobrand = $c->cobrand->users->search({ email => $user->email, id => { '!=', $user->id } })->first;
+        if ($existing_user_cobrand) {
             $existing_user->adopt($user);
             $c->forward( 'log_edit', [ $id, 'user', 'merge' ] );
             $c->res->redirect( $c->uri_for( 'user_edit', $existing_user->id ) );
         } else {
+            if ($existing_user) {
+                # Tried to change email to an existing one lacking permission
+                # so make sure it's switched back
+                $user->email($original_email);
+            }
             $user->update;
             if ($edited) {
                 $c->forward( 'log_edit', [ $id, 'user', 'edit' ] );
-- 
cgit v1.2.3


From 1115f106e0421c10a81c3ce8d187ef6cd3e639fc Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 9 Mar 2017 14:23:51 +0000
Subject: Specify options in 'all' status filter.

A cobrand may have a blank default that isn't everything, so the
"All reports" option must specify all the possible options.
---
 templates/web/base/reports/_list-filters.html | 3 ++-
 web/cobrands/fixmystreet/fixmystreet.js       | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 58be5cd50..61a44629d 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,5 +1,6 @@
 [% select_status = BLOCK %]
-    <select class="form-control js-multiple" name="status" id="statuses" multiple data-all="[% loc('All reports') %]">
+    <select class="form-control js-multiple" name="status" id="statuses" multiple
+      data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]'>
       [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %]
         <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option>
         <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8e8941421..6480f47f5 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -722,14 +722,15 @@ $.extend(fixmystreet.set_up, {
 
     function make_multi(id) {
         var $id = $('#' + id),
-            all = $id.data('all');
+            all = $id.data('all'),
+            allOpts = $id.data('allOptions') || [];
         $id.multiSelect({
             allText: all,
             noneText: all,
             positionMenuWithin: $('#side'),
             presets: [{
                 name: all,
-                options: []
+                options: allOpts
             }]
         });
     }
-- 
cgit v1.2.3


From 491eb26e463c5976a159060782c0217cf450d4fc Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 7 Mar 2017 16:33:18 +0000
Subject: [UK] Exclude Bristol from open311-populate-service-list.

---
 bin/open311-populate-service-list | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/open311-populate-service-list b/bin/open311-populate-service-list
index 211061258..8cb41a47b 100755
--- a/bin/open311-populate-service-list
+++ b/bin/open311-populate-service-list
@@ -23,7 +23,8 @@ my ($opt, $usage) = describe_options(
 print($usage->text), exit if $opt->help;
 
 my $bodies = FixMyStreet::DB->resultset('Body')->search( {
-    id => { '!=', 2237 }, # XXX Until Oxfordshire does do so
+    # Until Oxfordshire does, and Bristol stops erroring
+    name => { -not_in => [ 'Oxfordshire County Council', 'Bristol City Council' ] },
     send_method => 'Open311'
 } );
 my $verbose = 0;
-- 
cgit v1.2.3


From 8b43050c549bc3bb233bab2b7bd5652dfbb39a12 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 22 Sep 2016 19:24:10 +0100
Subject: Refactor SendReport::Open311 to use cobrand hooks.

Avoid doing cobrand-specific logic within SendReport::Open311.
The hooks defined are:
    open311_config: set extra fields
    open311_pre_send: set endpoints and munge data

These are tested in the new t/app/sendreport/open311.t, which does
not send any actual reports, but just checks that all the data is
munged into the expected format.  (tests under t/open311* should
already test the actual sending)

Remove unused Open311 special cases.
---
 perllib/FixMyStreet/Cobrand.pm               |  10 +
 perllib/FixMyStreet/Cobrand/Bromley.pm       |  33 ++++
 perllib/FixMyStreet/Cobrand/Greenwich.pm     |   9 +
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm   |  23 +++
 perllib/FixMyStreet/Cobrand/UK.pm            |  10 +-
 perllib/FixMyStreet/Cobrand/WestBerkshire.pm |  16 ++
 perllib/FixMyStreet/DB/Result/Body.pm        |  15 ++
 perllib/FixMyStreet/DB/Result/Problem.pm     |   4 +-
 perllib/FixMyStreet/SendReport/Open311.pm    |  84 ++-------
 t/app/sendreport/open311.t                   | 267 +++++++++++++++++++++++++++
 10 files changed, 391 insertions(+), 80 deletions(-)
 create mode 100644 perllib/FixMyStreet/Cobrand/WestBerkshire.pm
 create mode 100644 t/app/sendreport/open311.t

diff --git a/perllib/FixMyStreet/Cobrand.pm b/perllib/FixMyStreet/Cobrand.pm
index 9f61635d8..4b9f2bd0b 100644
--- a/perllib/FixMyStreet/Cobrand.pm
+++ b/perllib/FixMyStreet/Cobrand.pm
@@ -153,4 +153,14 @@ sub exists {
     return 0;
 }
 
+sub body_handler {
+    my ($class, $areas) = @_;
+
+    foreach my $avail ( $class->available_cobrand_classes ) {
+        my $cobrand = $class->get_class_for_moniker($avail->{moniker})->new({});
+        next unless $cobrand->can('council_id');
+        return $cobrand if $areas->{$cobrand->council_id};
+    }
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 2d0cb86f1..169175947 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -3,6 +3,7 @@ use parent 'FixMyStreet::Cobrand::UKCouncils';
 
 use strict;
 use warnings;
+use DateTime::Format::W3CDTF;
 
 sub council_id { return 2482; }
 sub council_area { return 'Bromley'; }
@@ -111,5 +112,37 @@ sub title_list {
     return ["MR", "MISS", "MRS", "MS", "DR"];
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    push @$extra,
+        { name => 'report_url',
+          value => $h->{url} },
+        { name => 'report_title',
+          value => $row->title },
+        { name => 'public_anonymity_required',
+          value => $row->anonymous ? 'TRUE' : 'FALSE' },
+        { name => 'email_alerts_requested',
+          value => 'FALSE' }, # always false as can never request them
+        { name => 'requested_datetime',
+          value => DateTime::Format::W3CDTF->format_datetime($row->confirmed->set_nanosecond(0)) },
+        { name => 'email',
+          value => $row->user->email };
+
+    # make sure we have last_name attribute present in row's extra, so
+    # it is passed correctly to Bromley as attribute[]
+    if ( $row->cobrand ne 'bromley' ) {
+        my ( $firstname, $lastname ) = ( $row->name =~ /(\w+)\.?\s+(.+)/ );
+        push @$extra, { name => 'last_name', value => $lastname };
+    }
+
+    $row->set_extra_fields(@$extra);
+
+    $params->{always_send_latlong} = 0;
+    $params->{send_notpinpointed} = 1;
+    $params->{extended_description} = 0;
+}
+
 1;
 
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 7d6058145..700a12782 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -61,4 +61,13 @@ sub on_map_default_max_pin_age {
     return '21 days';
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    # Greenwich doesn't have category metadata to fill this
+    push @$extra, { name => 'external_id', value => $row->id };
+    $row->set_extra_fields( @$extra );
+}
+
 1;
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 2820719b9..d585a5328 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -112,6 +112,29 @@ sub pin_colour {
     return 'yellow';
 }
 
+sub open311_config {
+    my ($self, $row, $h, $params) = @_;
+
+    my $extra = $row->get_extra_fields;
+    push @$extra, { name => 'external_id', value => $row->id };
+
+    if ($h->{closest_address}) {
+        push @$extra, { name => 'closest_address', value => $h->{closest_address} }
+    }
+    if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
+        push @$extra, { name => 'northing', value => $h->{northing} };
+        push @$extra, { name => 'easting', value => $h->{easting} };
+    }
+    $row->set_extra_fields( @$extra );
+
+    $params->{extended_description} = 'oxfordshire';
+}
+
+sub open311_pre_send {
+    my ($self, $row, $open311) = @_;
+    $open311->endpoints( { requests => 'open311_service_request.cgi' } );
+}
+
 sub on_map_default_status { return 'open'; }
 
 sub contact_email {
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 08ecf0b7d..945af48f8 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -1,5 +1,6 @@
 package FixMyStreet::Cobrand::UK;
 use base 'FixMyStreet::Cobrand::Default';
+use strict;
 
 use JSON::MaybeXS;
 use mySociety::MaPit;
@@ -354,13 +355,8 @@ sub get_body_handler_for_problem {
     my @bodies = values %{$row->bodies};
     my %areas = map { %{$_->areas} } @bodies;
 
-    foreach my $avail ( FixMyStreet::Cobrand->available_cobrand_classes ) {
-        my $class = FixMyStreet::Cobrand->get_class_for_moniker($avail->{moniker});
-        my $cobrand = $class->new({});
-        next unless $cobrand->can('council_id');
-        return $cobrand if $areas{$cobrand->council_id};
-    }
-
+    my $cobrand = FixMyStreet::Cobrand->body_handler(\%areas);
+    return $cobrand if $cobrand;
     return ref $self ? $self : $self->new;
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/WestBerkshire.pm b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
new file mode 100644
index 000000000..1ffdf0286
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
@@ -0,0 +1,16 @@
+package FixMyStreet::Cobrand::WestBerkshire;
+use base 'FixMyStreet::Cobrand::UKCouncils';
+
+use strict;
+use warnings;
+
+sub council_id { 2619 }
+
+# non standard west berks end points
+sub open311_pre_send {
+    my ($self, $row, $open311) = @_;
+    $open311->endpoints( { services => 'Services', requests => 'Requests' } );
+}
+
+1;
+
diff --git a/perllib/FixMyStreet/DB/Result/Body.pm b/perllib/FixMyStreet/DB/Result/Body.pm
index 037b69352..6dac8821c 100644
--- a/perllib/FixMyStreet/DB/Result/Body.pm
+++ b/perllib/FixMyStreet/DB/Result/Body.pm
@@ -127,4 +127,19 @@ sub areas {
     return \%ids;
 }
 
+=head2 get_cobrand_handler
+
+Get a cobrand object for this body, if there is one.
+
+e.g.
+    * if the problem was sent to Bromley it will return ::Bromley
+    * if the problem was sent to Camden it will return nothing
+
+=cut
+
+sub get_cobrand_handler {
+    my $self = shift;
+    return FixMyStreet::Cobrand->body_handler($self->areas);
+}
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 4ccad3690..dcd5ecc71 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -1107,9 +1107,7 @@ has traffic_management_options => (
     default => sub {
         my $self = shift;
         my $cobrand = $self->get_cobrand_logged;
-        if ( $cobrand->can('get_body_handler_for_problem') ) {
-            $cobrand = $cobrand->get_body_handler_for_problem( $self );
-        }
+        $cobrand = $cobrand->call_hook(get_body_handler_for_problem => $self) || $cobrand;
         return $cobrand->traffic_management_options;
     },
 );
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 9c55683ed..059690612 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -5,14 +5,7 @@ use namespace::autoclean;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
-use DateTime::Format::W3CDTF;
 use Open311;
-use Readonly;
-
-Readonly::Scalar my $COUNCIL_ID_OXFORDSHIRE => 2237;
-Readonly::Scalar my $COUNCIL_ID_WARWICKSHIRE => 2243;
-Readonly::Scalar my $COUNCIL_ID_GREENWICH => 2493;
-Readonly::Scalar my $COUNCIL_ID_BROMLEY => 2482;
 
 has open311_test_req_used => (
     is => 'rw',
@@ -27,47 +20,18 @@ sub send {
     foreach my $body ( @{ $self->bodies } ) {
         my $conf = $self->body_config->{ $body->id };
 
-        my $always_send_latlong = 1;
-        my $send_notpinpointed  = 0;
-        my $use_service_as_deviceid = 0;
-
-        my $extended_desc = 1;
-
-        my $extra = $row->get_extra_fields();
+        my %open311_params = (
+            jurisdiction            => $conf->jurisdiction,
+            endpoint                => $conf->endpoint,
+            api_key                 => $conf->api_key,
+            always_send_latlong     => 1,
+            send_notpinpointed      => 0,
+            use_service_as_deviceid => 0,
+            extended_description    => 1,
+        );
 
-        # Extra bromley fields
-        if ( $row->bodies_str eq $COUNCIL_ID_BROMLEY ) {
-            push @$extra, { name => 'report_url', value => $h->{url} };
-            push @$extra, { name => 'report_title', value => $row->title };
-            push @$extra, { name => 'public_anonymity_required', value => $row->anonymous ? 'TRUE' : 'FALSE' };
-            push @$extra, { name => 'email_alerts_requested', value => 'FALSE' }; # always false as can never request them
-            push @$extra, { name => 'requested_datetime', value => DateTime::Format::W3CDTF->format_datetime($row->confirmed->set_nanosecond(0)) };
-            push @$extra, { name => 'email', value => $row->user->email };
-            # make sure we have last_name attribute present in row's extra, so
-            # it is passed correctly to Bromley as attribute[]
-            if ( $row->cobrand ne 'bromley' ) {
-                my ( $firstname, $lastname ) = ( $row->name =~ /(\w+)\.?\s+(.+)/ );
-                push @$extra, { name => 'last_name', value => $lastname };
-            }
-            $always_send_latlong = 0;
-            $send_notpinpointed = 1;
-            $extended_desc = 0;
-        } elsif ( $row->bodies_str =~ /\b$COUNCIL_ID_OXFORDSHIRE\b/ ) {
-            # Oxfordshire doesn't have category metadata to fill these
-            $extended_desc = 'oxfordshire';
-            push @$extra, { name => 'external_id', value => $row->id };
-            push @$extra, { name => 'closest_address', value => $h->{closest_address} } if $h->{closest_address};
-            if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
-                push @$extra, { name => 'northing', value => $h->{northing} };
-                push @$extra, { name => 'easting', value => $h->{easting} };
-            }
-        } elsif ( $row->bodies_str =~ /\b$COUNCIL_ID_WARWICKSHIRE\b/ ) {
-            $extended_desc = 'warwickshire';
-            push @$extra, { name => 'closest_address', value => $h->{closest_address} } if $h->{closest_address};
-        } elsif ( $row->bodies_str == $COUNCIL_ID_GREENWICH ) {
-            # Greenwich doesn't have category metadata to fill this
-            push @$extra, { name => 'external_id', value => $row->id };
-        }
+        my $cobrand = $body->get_cobrand_handler || $row->get_cobrand_logged;
+        $cobrand->call_hook(open311_config => $row, $h, \%open311_params);
 
         # Try and fill in some ones that we've been asked for, but not asked the user for
 
@@ -77,6 +41,8 @@ sub send {
             category => $row->category
         } );
 
+        my $extra = $row->get_extra_fields();
+
         my $id_field = $contact->id_field;
         foreach (@{$contact->get_extra_fields}) {
             if ($_->{code} eq $id_field) {
@@ -92,15 +58,6 @@ sub send {
 
         $row->set_extra_fields( @$extra ) if @$extra;
 
-        my %open311_params = (
-            jurisdiction            => $conf->jurisdiction,
-            endpoint                => $conf->endpoint,
-            api_key                 => $conf->api_key,
-            always_send_latlong     => $always_send_latlong,
-            send_notpinpointed      => $send_notpinpointed,
-            use_service_as_deviceid => $use_service_as_deviceid,
-            extended_description    => $extended_desc,
-        );
         if (FixMyStreet->test_mode) {
             my $test_res = HTTP::Response->new();
             $test_res->code(200);
@@ -112,20 +69,7 @@ sub send {
 
         my $open311 = Open311->new( %open311_params );
 
-        # non standard west berks end points
-        if ( $row->bodies_str =~ /2619/ ) {
-            $open311->endpoints( { services => 'Services', requests => 'Requests' } );
-        }
-
-        # non-standard Oxfordshire endpoint (because it's just a script, not a full Open311 service)
-        if ( $row->bodies_str =~ /$COUNCIL_ID_OXFORDSHIRE/ ) {
-            $open311->endpoints( { requests => 'open311_service_request.cgi' } );
-        }
-
-        # required to get round issues with CRM constraints
-        if ( $row->bodies_str =~ /2218/ ) {
-            $row->user->name( $row->user->id . ' ' . $row->user->name );
-        }
+        $cobrand->call_hook(open311_pre_send => $row, $open311);
 
         my $resp = $open311->send_service_request( $row, $h, $contact->email );
         if (FixMyStreet->test_mode) {
diff --git a/t/app/sendreport/open311.t b/t/app/sendreport/open311.t
new file mode 100644
index 000000000..c4c17577c
--- /dev/null
+++ b/t/app/sendreport/open311.t
@@ -0,0 +1,267 @@
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Deep;
+
+use Open311;
+use FixMyStreet::SendReport::Open311;
+use FixMyStreet::DB;
+
+use Data::Dumper;
+
+package main;
+sub test_overrides; # defined below
+
+use constant TEST_USER_EMAIL => 'fred@example.com';
+
+my %standard_open311_parameters = (
+    'use_extended_updates' => 0,
+    'send_notpinpointed' => 0,
+    'extended_description' => 1,
+    'use_service_as_deviceid' => 0,
+    'extended_statuses' => 0,
+    'always_send_latlong' => 1,
+    'debug' => 0,
+    'error' => '',
+    'endpoints' => {
+        'requests' => 'requests.xml',
+        'service_request_updates' => 'servicerequestupdates.xml',
+        'services' => 'services.xml',
+        'update' => 'servicerequestupdates.xml',
+    },
+);
+
+test_overrides oxfordshire =>
+    {
+        body_name => 'Oxfordshire',
+        body_id   => 2237,
+        row_data  => {
+            postcode => 'OX1 1AA',
+        },
+        extra => {
+            northing => 100,
+            easting => 100,
+            closest_address => '49 St Giles',
+        },
+    },
+    superhashof({
+        handler => isa('FixMyStreet::Cobrand::Oxfordshire'),
+        discard_changes => 1,
+        'open311' => noclass(superhashof({
+            %standard_open311_parameters,
+            'extended_description' => 'oxfordshire',
+            'endpoints' => {
+                'requests' => 'open311_service_request.cgi'
+            },
+        })),
+        problem_extra => bag(
+            { name => 'northing', value => 100 },
+            { name => 'easting', value => 100 },
+            { name => 'closest_address' => value => '49 St Giles' },
+            { name => 'external_id', value => re('[0-9]+') },
+        ),
+    });
+
+my $bromley_check =
+    superhashof({
+        handler => isa('FixMyStreet::Cobrand::Bromley'),
+        discard_changes => 1,
+        'open311' => noclass(superhashof({
+            %standard_open311_parameters,
+            'send_notpinpointed' => 1,
+            'extended_description' => 0,
+            'use_service_as_deviceid' => 0,
+            'always_send_latlong' => 0,
+        })),
+        problem_extra => bag(
+            { name => 'report_url' => value => 'http://example.com/1234' },
+            { name => 'report_title', value => 'Problem' },
+            { name => 'public_anonymity_required', value => 'TRUE' },
+            { name => 'email_alerts_requested', value => 'FALSE' },
+            { name => 'requested_datetime', value => re(qr/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)/) },
+            { name => 'email', value => TEST_USER_EMAIL },
+            { name => 'last_name', value => 'Bloggs' },
+        ),
+    });
+
+test_overrides bromley =>
+    {
+        body_name => 'Bromley',
+        body_id   => 2482,
+        row_data  => {
+            postcode => 'BR1 1AA',
+            extra => [ { name => 'last_name', value => 'Bloggs' } ],
+        },
+        extra => {
+            northing => 100,
+            easting => 100,
+            url => 'http://example.com/1234',
+        },
+    },
+    $bromley_check;
+
+test_overrides fixmystreet =>
+    {
+        body_name => 'Bromley',
+        body_id   => 2482,
+        row_data  => {
+            postcode => 'BR1 1AA',
+            # NB: we don't pass last_name here, as main cobrand doesn't know to do this!
+        },
+        extra => {
+            northing => 100,
+            easting => 100,
+            url => 'http://example.com/1234',
+        },
+    },
+    $bromley_check;
+
+test_overrides greenwich =>
+    {
+        body_name => 'Greenwich',
+        body_id   => 2493,
+    },
+    superhashof({
+        handler => isa('FixMyStreet::Cobrand::Greenwich'),
+        'open311' => noclass(superhashof({
+            %standard_open311_parameters,
+        })),
+        problem_extra => bag(
+            { name => 'external_id', value => re('[0-9]+') },
+        ),
+    });
+
+test_overrides fixmystreet =>
+    {
+        body_name => 'West Berkshire',
+        body_id   => 2619,
+        row_data  => {
+            postcode => 'RG1 1AA',
+        },
+    },
+    superhashof({
+        handler => isa('FixMyStreet::Cobrand::WestBerkshire'),
+        'open311' => noclass(superhashof({
+            %standard_open311_parameters,
+            'endpoints' => {
+                'requests' => 'Requests',
+                'services' => 'Services',
+            },
+        })),
+    });
+
+sub test_overrides {
+    # NB: Open311 and ::SendReport::Open311 are mocked below in BEGIN { ... }
+    my ($cobrand, $input, $expected_data) = @_;
+    subtest "$cobrand ($input->{body_name}) overrides" => sub {
+
+        FixMyStreet::override_config {
+            ALLOWED_COBRANDS => ['fixmystreet', 'oxfordshire', 'bromley', 'westberkshire', 'greenwich'],
+        }, sub {
+            my $db = FixMyStreet::DB->storage->schema;
+            $db->txn_begin;
+
+            my $params = { id => $input->{body_id}, name => $input->{body_name} };
+            my $body = $db->resultset('Body')->find_or_create($params);
+            $body->body_areas->create({ area_id => $input->{body_id} });
+            ok $body, "found/created body " . $input->{body_name};
+            $body->update({ can_be_devolved => 1 });
+
+            my $contact = $body->contacts->find_or_create(
+                confirmed => 1,
+                email => 'ZZ',
+                category => 'ZZ',
+                deleted => 0,
+                editor => 'test suite',
+                note => '',
+                whenedited => DateTime->now,
+                jurisdiction => '1234',
+                api_key => 'SEEKRIT',
+                body_id => $input->{body_id},
+            );
+            $contact->update({ send_method => 'Open311', endpoint => 'http://example.com/open311' });
+
+            my $user = $db->resultset('User')->create( {
+                    name => 'Fred Bloggs',
+                    email => TEST_USER_EMAIL,
+                    password => 'dummy',
+            });
+
+            my $row = $db->resultset('Problem')->create( {
+                title => 'Problem',
+                detail => 'A big problem',
+                used_map => 1,
+                name => 'Fred Bloggs',
+                anonymous => 1,
+                state => 'unconfirmed',
+                bodies_str => $input->{body_id},
+                areas => (sprintf ',%d,', $input->{body_id}),
+                category => 'ZZ',
+                cobrand => $cobrand,
+                user => $user,
+                postcode => 'ZZ1 1AA',
+                latitude => 100,
+                longitude => 100,
+                confirmed => DateTime->now(),
+                %{ $input->{row_data} || {} },
+            } );
+
+            my $sr = FixMyStreet::SendReport::Open311->new;
+            $sr->add_body($body, $contact);
+            $sr->send( $row, $input->{extra} || {} );
+
+            cmp_deeply (Open311->_get_test_data, $expected_data, 'Data as expected')
+                or diag Dumper( Open311->_get_test_data );
+
+            Open311->_reset_test_data();
+            $db->txn_rollback;
+        };
+    }
+}
+
+BEGIN {
+    # Prepare the %data variable to write data from Open311 calls to...
+    my %data;
+    package Open311;
+    use Class::Method::Modifiers;
+    around new => sub {
+        my $orig = shift;
+        my ($class, %params) = @_;
+        my $self = $class->$orig(%params);
+        $data{open311} = $self;
+        $self;
+    };
+    around send_service_request => sub {
+        my $orig = shift;
+        my ($self, $problem, $extra, $service_code) = @_;
+        $data{problem} = { $problem->get_columns };
+        $data{extra} = $extra;
+        $data{problem_extra} = $problem->get_extra_fields;
+        $data{problem_user} = { $problem->user->get_columns };
+        $data{service_code} = $service_code;
+        # don't actually send the service request!
+    };
+
+    sub _get_test_data { return +{ %data } }
+    sub _reset_test_data { %data = () }
+
+    package FixMyStreet::DB::Result::Problem;
+    use Class::Method::Modifiers; # is marked as immutable by Moose
+    sub discard_changes {
+        $data{discard_changes}++;
+        # no need to actually discard, as we're in transaction anyway
+    };
+
+    package FixMyStreet::DB::Result::Body;
+    use Class::Method::Modifiers; # is marked as immutable by Moose
+    around get_cobrand_handler => sub {
+        my $orig = shift;
+        my ($self) = @_;
+        my $handler = $self->$orig();
+        $data{handler} = $handler;
+        $handler;
+    };
+}
+
+done_testing();
-- 
cgit v1.2.3


From 238d9cbbc03940c0b64b353f5d1f90b0854e6ab7 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 1 Mar 2017 16:24:09 +0000
Subject: Make sure report Ajax call is not cached by IE11.

IE11 caches this Ajax call, not calling out to the server at all if it
is made again (e.g. after an update has been made). Fixes #1638.
---
 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 8e8941421..a0d830a65 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1314,7 +1314,7 @@ fixmystreet.display = {
   },
 
   report: function(reportPageUrl, reportId, callback) {
-    $.ajax(reportPageUrl).done(function(html, textStatus, jqXHR) {
+    $.ajax(reportPageUrl, { cache: false }).done(function(html, textStatus, jqXHR) {
         var $reportPage = $(html),
             $twoColReport = $reportPage.find('.two_column_sidebar'),
             $sideReport = $reportPage.find('#side-report');
-- 
cgit v1.2.3


From 6d2ecdb10f9f7a5110bb6bfc33e9fbfdc436ecea Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Mar 2017 17:13:02 +0000
Subject: Reduce unneeded admin CSS specificity.

---
 web/cobrands/sass/_admin.scss | 99 +++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 47 deletions(-)

diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index a53f9f60a..54f18b16f 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -67,39 +67,51 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
         list-style: none;
       }
     }
-    .admin-box { // for delimiting forms, etc
-      border:1px solid #999;
-      padding:0.5em 1em;
-      margin:1.5em 0;
-      h2 { // only really want on first-child
+}
+
+.admin-box { // for delimiting forms, etc
+    border:1px solid #999;
+    padding:0.5em 1em;
+    margin:1.5em 0;
+    h2 { // only really want on first-child
         margin-top: 0;
-      }
     }
-  .admin-offsite-link {
+}
+
+.admin-offsite-link {
     display: inline;
-  }
-  .fms-admin-warning, .fms-admin-info {
+    padding-#{$right}: 12px;
+    background-image: url(../../i/external-link.png);
+    background-position: $right top;
+    background-repeat: no-repeat;
+}
+
+.fms-admin-warning, .fms-admin-info {
     padding: 1em;
     font-size: 90%;
     border-style: solid;
     border-width: 1px;
     border-#{$left}-width: 1em;
     margin-bottom: 1em;
-  }
-  .fms-admin-warning {
-      border-color: #f99;
-      background-color: #ffe1e1;
-  }
-  .fms-admin-info {
-      border-color: #9f9;
-      background-color: #e1ffe1;
-  }
-  .admin-open311-only {
+}
+
+.fms-admin-warning {
+    border-color: #f99;
+    background-color: #ffe1e1;
+}
+
+.fms-admin-info {
+    border-color: #9f9;
+    background-color: #e1ffe1;
+}
+
+.admin-open311-only {
     border:1px solid #666;
     padding:1em;
     margin: 1em 0;
-  }
-  .admin-hint {
+}
+
+.admin-hint {
     font-size: 80%; // little question marks are small
     cursor: pointer;
     display: block;
@@ -115,35 +127,28 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
     -webkit-border-radius: 0.333em;
     border-radius: 0.333em;
     p {
-      display:none;
+        display:none;
     }
     &:before { content: "?" }
     &.admin-hint-show {
-      font-size: 90%;
-      text-align: $left;
-      display: block;
-      float:none;
-      margin:1em 0;
-      &:before { content: "" }
-      background-color: inherit !important;
-      p {
-        font-weight: normal;
+        font-size: 90%;
+        text-align: $left;
         display: block;
-        background-color: #ff9;
-        color: #000;
-        border-style: solid;
-        border-width: 1px;
-        border-#{$left}-width: 1em;
-        border-color: #f93;
-        padding:1em;
-        margin: 0;
-      }
+        float:none;
+        margin:1em 0;
+        &:before { content: "" }
+        background-color: inherit !important;
+        p {
+            font-weight: normal;
+            display: block;
+            background-color: #ff9;
+            color: #000;
+            border-style: solid;
+            border-width: 1px;
+            border-#{$left}-width: 1em;
+            border-color: #f93;
+            padding:1em;
+            margin: 0;
+        }
     }
-  }
-  .admin-offsite-link {
-    padding-#{$right}: 12px;
-    background-image: url(../../i/external-link.png);
-    background-position: $right top;
-    background-repeat: no-repeat;
-  }
 }
-- 
cgit v1.2.3


From 342b4ecff061fb11d47162389407ba58d6ac3d68 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 2 Mar 2017 17:16:47 +0000
Subject: Add submit buttons to admin index search forms.

Also slightly tidy up display.
---
 templates/web/base/admin/index.html |  6 ++++++
 web/cobrands/sass/_admin.scss       | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html
index f573f0e7a..8498055b1 100644
--- a/templates/web/base/admin/index.html
+++ b/templates/web/base/admin/index.html
@@ -20,14 +20,18 @@ and to receive notices of updates.
   </p>
 [% END %]
 
+<div class="admin-index-search form-txt-submit-box clearfix">
+
 <form method="get" action="[% c.uri_for('reports') %]" accept-charset="utf-8">
     <p><label for="search_reports">[% loc('Search Reports') %]</label>
         <input type="text" class="form-control" name="search"  size="30" id="search_reports" value="[% searched | html %]">
+        <input type="submit" class="btn" value="[% loc('Go') %]">
 </form>
 
 <form method="get" action="[% c.uri_for('users') %]" accept-charset="utf-8">
     <p><label for="search_users">[% loc('Search Users') %]</label>
         <input type="text" class="form-control" name="search"  size="30" id="search_users" value="[% searched | html %]">
+        <input type="submit" class="btn" value="[% loc('Go') %]">
 </form>
 
 [% IF c.user.is_superuser %]
@@ -46,6 +50,8 @@ and to receive notices of updates.
   </form>
 [% END %]
 
+</div>
+
 [% IF unsent_reports.size %]
 <h2>[% loc('Reports waiting to be sent') %]</h2>
 
diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index 54f18b16f..58917a8ce 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -152,3 +152,14 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
         }
     }
 }
+
+.admin-index-search {
+    width: 27em;
+    form {
+        clear: left;
+    }
+    select {
+        max-width: 65%;
+        float: left;
+    }
+}
-- 
cgit v1.2.3


From f2756c4c825ba73c76fafd84acc3663ea410858a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 9 Mar 2017 18:51:13 +0000
Subject: Move staff-only JavaScript to separate file.

---
 templates/web/base/common_scripts.html  |   8 +-
 web/cobrands/fixmystreet/admin.js       | 125 +++++++++++
 web/cobrands/fixmystreet/fixmystreet.js | 358 ++------------------------------
 web/cobrands/fixmystreet/staff.js       | 342 ++++++++++++++++++++++++++++++
 web/js/fixmystreet-admin.js             | 125 -----------
 5 files changed, 487 insertions(+), 471 deletions(-)
 create mode 100644 web/cobrands/fixmystreet/admin.js
 create mode 100644 web/cobrands/fixmystreet/staff.js
 delete mode 100644 web/js/fixmystreet-admin.js

diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index 1d53f1d51..42c04f11f 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -16,6 +16,12 @@ scripts.push(
     version('/cobrands/fixmystreet/fixmystreet.js'),
 );
 
+IF c.user_exists AND (c.user.from_body OR c.user.is_superuser);
+    scripts.push(
+        version('/cobrands/fixmystreet/staff.js')
+    );
+END;
+
 FOR script IN map_js;
     scripts.push(script);
 END;
@@ -28,7 +34,7 @@ scripts.push(
 IF admin;
     scripts.push(
         version('/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js'),
-        version('/js/fixmystreet-admin.js'),
+        version('/cobrands/fixmystreet/admin.js'),
     );
 END;
 
diff --git a/web/cobrands/fixmystreet/admin.js b/web/cobrands/fixmystreet/admin.js
new file mode 100644
index 000000000..02eb30766
--- /dev/null
+++ b/web/cobrands/fixmystreet/admin.js
@@ -0,0 +1,125 @@
+$(function(){
+    // available for admin pages
+
+    // hide the open311_only section and reveal it only when send_method is relevant
+    function hide_or_show_open311(e, hide_fast) {
+        var $form = $(this).closest("form");
+        var $open311_only = $form.find('.admin-open311-only');
+
+        var send_method = $(this).val();
+        var show_open311 = false;
+        if ($form.find('[name=endpoint]').val()) {
+            show_open311 = true; // always show the form if there is an endpoint value
+        } else if (send_method && !send_method.match(/^(email|noop|refused)$/i)) {
+            show_open311 = true;
+        }
+        if (show_open311) {
+            $open311_only.slideDown();
+        } else {
+            if (hide_fast) {
+                $open311_only.hide();
+            } else {
+                $open311_only.slideUp();
+            }
+        }
+    }
+
+    if ($('.admin-open311-only').length) {
+        // Add handler to send_method dropdowns and set initial visibility
+        $('[name=send_method]').on('change', hide_or_show_open311).each(function() {
+            hide_or_show_open311.call(this, null, true);
+        });
+    }
+
+    // Some lists of checkboxes have 'select all/none' links at the top
+    $("a[data-select-none], a[data-select-all]").click(function(e) {
+        e.preventDefault();
+        var checked = $(this).filter('[data-select-all]').length > 0;
+        $(this).closest("ul").find('input[type=checkbox]').prop('checked', checked);
+    });
+
+
+    // admin hints: maybe better implemented as tooltips?
+    $(".admin-hint").on('click', function(){
+        if ($(this).hasClass('admin-hint-show')) {
+            $(this).removeClass('admin-hint-show');
+        } else {
+            $(this).addClass('admin-hint-show');
+        }
+    });
+
+    // on a body's page, hide/show deleted contact categories
+    var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
+    if ($table_with_deleted_contacts.length == 1) {
+        var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
+        $table_with_deleted_contacts.before($toggle_deleted_btn);
+        $toggle_deleted_btn.on('click', function(e){
+            e.preventDefault();
+            var $cols = $table_with_deleted_contacts.find('tr.is-deleted');
+            if ($cols.first().is(':visible')) {
+                $cols.hide();
+                $(this).prop("value", 'Show deleted contacts');
+            } else {
+                $cols.show();
+                $(this).prop("value", 'Hide deleted contacts');
+            }
+        });
+    }
+
+    // On some cobrands the datepicker ends up beneath items in the header, e.g.
+    // the logo.
+    // This function sets an appropriate z-index when the datepicker is shown.
+    // Sadly there's no way to set the z-index when creating the datepicker, so
+    // we have to run this little helper using the datepicker beforeShow
+    // handler.
+    function fixZIndex() {
+        setTimeout(function() {
+            $('.ui-datepicker').css('z-index', 10);
+        }, 0);
+    }
+
+    $( "#start_date" ).datepicker({
+      defaultDate: "-1w",
+      changeMonth: true,
+      dateFormat: 'dd/mm/yy' ,
+      // This sets the other fields minDate to our date
+      onClose: function( selectedDate ) {
+        $( "#end_date" ).datepicker( "option", "minDate", selectedDate );
+      },
+      beforeShow: fixZIndex
+    });
+    $( "#end_date" ).datepicker({
+     /// defaultDate: "+1w",
+      changeMonth: true,
+      dateFormat: 'dd/mm/yy' ,
+      onClose: function( selectedDate ) {
+        $( "#start_date" ).datepicker( "option", "maxDate", selectedDate );
+      },
+      beforeShow: fixZIndex
+    });
+
+    // On user edit page, hide the area/categories fields if body changes
+    $("form#user_edit select#body").change(function() {
+        var show_area = $(this).val() == $(this).find("[data-originally-selected]").val();
+        $("form#user_edit select#area_id").closest("li").toggle(show_area);
+        $("form#user_edit .js-user-categories").toggle(show_area);
+    });
+
+    // On category edit page, hide the reputation input if inspection isn't required
+    $("form#category_edit #inspection_required").change(function() {
+        var $p = $("form#category_edit #reputation_threshold").closest("p");
+        var $hint = $p.prevUntil().first();
+        if (this.checked) {
+            $p.removeClass("hidden");
+            if ($hint.length) {
+                $hint.removeClass("hidden");
+            }
+        } else {
+            $p.addClass("hidden");
+            if ($hint.length) {
+                $hint.addClass("hidden");
+            }
+        }
+    });
+});
+
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index a0d830a65..df8285942 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -222,6 +222,14 @@ fixmystreet.update_list_item_buttons = function($list) {
   $list.children(':last-child').find('[name="shortlist-down"]').prop('disabled', true);
 };
 
+// A tiny helper to call a function only if it exists (so we can
+// call this with staff-only functions and they won't error).
+fixmystreet.run = function(fn) {
+    if (fn) {
+        fn.call(this);
+    }
+};
+
 fixmystreet.set_up = fixmystreet.set_up || {};
 $.extend(fixmystreet.set_up, {
   basics: function() {
@@ -406,199 +414,6 @@ $.extend(fixmystreet.set_up, {
     });
   },
 
-  manage_duplicates: function() {
-      // Deal with changes to report state by inspector/other staff, specifically
-      // displaying nearby reports if it's changed to 'duplicate'.
-      function refresh_duplicate_list() {
-          var report_id = $("#report_inspect_form .js-report-id").text();
-          var args = {
-              filter_category: $("#report_inspect_form select#category").val(),
-              latitude: $('input[name="latitude"]').val(),
-              longitude: $('input[name="longitude"]').val()
-          };
-          $("#js-duplicate-reports ul").html("<li>Loading...</li>");
-          var nearby_url = '/report/'+report_id+'/nearby.json';
-          $.getJSON(nearby_url, args, function(data) {
-              var duplicate_of = $("#report_inspect_form [name=duplicate_of]").val();
-              var $reports = $(data.current)
-                              .filter("li")
-                              .not("[data-report-id="+report_id+"]")
-                              .slice(0, 5);
-              $reports.filter("[data-report-id="+duplicate_of+"]").addClass("item-list--reports__item--selected");
-
-              (function() {
-                  var timeout;
-                  $reports.on('mouseenter', function(){
-                      clearTimeout(timeout);
-                      fixmystreet.maps.markers_highlight(parseInt($(this).data('reportId'), 10));
-                  }).on('mouseleave', function(){
-                      timeout = setTimeout(fixmystreet.maps.markers_highlight, 50);
-                  });
-              })();
-
-              $("#js-duplicate-reports ul").empty().prepend($reports);
-
-              $reports.find("a").click(function() {
-                  var report_id = $(this).closest("li").data('reportId');
-                  $("#report_inspect_form [name=duplicate_of]").val(report_id);
-                  $("#js-duplicate-reports ul li").removeClass("item-list--reports__item--selected");
-                  $(this).closest("li").addClass("item-list--reports__item--selected");
-                  return false;
-              });
-
-              show_nearby_pins(data, report_id);
-          });
-      }
-
-      function show_nearby_pins(data, report_id) {
-          var markers = fixmystreet.maps.markers_list( data.pins, true );
-          // We're replacing all the features in the markers layer with the
-          // possible duplicates, but the list of pins from the server doesn't
-          // include the current report. So we need to extract the feature for
-          // the current report and include it in the list of features we're
-          // showing on the layer.
-          var report_marker = fixmystreet.maps.get_marker_by_id(parseInt(report_id, 10));
-          if (report_marker) {
-              markers.unshift(report_marker);
-          }
-          fixmystreet.markers.removeAllFeatures();
-          fixmystreet.markers.addFeatures( markers );
-      }
-
-      function state_change() {
-          // The duplicate report list only makes sense when state is 'duplicate'
-          if ($(this).val() !== "duplicate") {
-              $("#js-duplicate-reports").addClass("hidden");
-              return;
-          } else {
-              $("#js-duplicate-reports").removeClass("hidden");
-          }
-          // If this report is already marked as a duplicate of another, then
-          // there's no need to refresh the list of duplicate reports
-          var duplicate_of = $("#report_inspect_form [name=duplicate_of]").val();
-          if (!!duplicate_of) {
-              return;
-          }
-
-          refresh_duplicate_list();
-      }
-
-      $("#report_inspect_form").on("change.state", "select#state", state_change);
-      $("#js-change-duplicate-report").click(refresh_duplicate_list);
-  },
-
-  list_item_actions: function() {
-    function toggle_shortlist(btn, sw, id) {
-        btn.attr('class', 'item-list__item__shortlist-' + sw);
-        btn.attr('title', btn.data('label-' + sw));
-        if (id) {
-            sw += '-' + id;
-        }
-        btn.attr('name', 'shortlist-' + sw);
-    }
-
-    $('.item-list--reports').on('click', ':submit', function(e) {
-      e.preventDefault();
-
-      var $submitButton = $(this);
-      var whatUserWants = $submitButton.prop('name');
-      var data;
-      var $item;
-      var $list;
-      var $hiddenInput;
-      var report_id;
-      if (fixmystreet.page === 'around') {
-          // Deal differently because one big form
-          var parts = whatUserWants.split('-');
-          whatUserWants = parts[0] + '-' + parts[1];
-          report_id = parts[2];
-          var token = $('[name=token]').val();
-          data = whatUserWants + '=1&token=' + token + '&id=' + report_id;
-      } else {
-          var $form = $(this).parents('form');
-          $item = $form.parent('.item-list__item');
-          $list = $item.parent('.item-list');
-
-          // The server expects to be told which button/input triggered the form
-          // submission. But $form.serialize() doesn't know that. So we inject a
-          // hidden input into the form, that can pass the name and value of the
-          // submit button to the server, as it expects.
-          $hiddenInput = $('<input>').attr({
-            type: 'hidden',
-            name: whatUserWants,
-            value: $submitButton.prop('value')
-          }).appendTo($form);
-          data = $form.serialize() + '&ajax=1';
-      }
-
-      // Update UI while the ajax request is sent in the background.
-      if ('shortlist-down' === whatUserWants) {
-        $item.insertAfter( $item.next() );
-      } else if ('shortlist-up' === whatUserWants) {
-        $item.insertBefore( $item.prev() );
-      } else if ('shortlist-remove' === whatUserWants) {
-          toggle_shortlist($submitButton, 'add', report_id);
-      } else if ('shortlist-add' === whatUserWants) {
-          toggle_shortlist($submitButton, 'remove', report_id);
-      }
-
-      // Items have moved around. We need to make sure the "up" button on the
-      // first item, and the "down" button on the last item, are disabled.
-      fixmystreet.update_list_item_buttons($list);
-
-      $.ajax({
-        url: '/my/planned/change',
-        type: 'POST',
-        data: data
-      }).fail(function() {
-        // Undo the UI changes we made.
-        if ('shortlist-down' === whatUserWants) {
-          $item.insertBefore( $item.prev() );
-        } else if ('shortlist-up' === whatUserWants) {
-          $item.insertAfter( $item.next() );
-        } else if ('shortlist-remove' === whatUserWants) {
-          toggle_shortlist($submitButton, 'remove', report_id);
-        } else if ('shortlist-add' === whatUserWants) {
-          toggle_shortlist($submitButton, 'add', report_id);
-        }
-        fixmystreet.update_list_item_buttons($list);
-      }).complete(function() {
-        if ($hiddenInput) {
-          $hiddenInput.remove();
-        }
-      });
-    });
-  },
-
-  contribute_as: function() {
-    $('.content').on('change', '.js-contribute-as', function(){
-        var opt = this.options[this.selectedIndex],
-            val = opt.value,
-            txt = opt.text;
-        var $emailInput = $('input[name=email]').add('input[name=rznvy]');
-        var $nameInput = $('input[name=name]');
-        var $showNameCheckbox = $('input[name=may_show_name]');
-        var $addAlertCheckbox = $('#form_add_alert');
-        if (val === 'myself') {
-            $emailInput.val($emailInput.prop('defaultValue')).prop('disabled', true);
-            $nameInput.val($nameInput.prop('defaultValue')).prop('disabled', false);
-            $showNameCheckbox.prop('checked', false).prop('disabled', false);
-            $addAlertCheckbox.prop('checked', true).prop('disabled', false);
-        } else if (val === 'another_user') {
-            $emailInput.val('').prop('disabled', false);
-            $nameInput.val('').prop('disabled', false);
-            $showNameCheckbox.prop('checked', false).prop('disabled', true);
-            $addAlertCheckbox.prop('checked', true).prop('disabled', false);
-        } else if (val === 'body') {
-            $emailInput.val('-').prop('disabled', true);
-            $nameInput.val(txt).prop('disabled', true);
-            $showNameCheckbox.prop('checked', true).prop('disabled', true);
-            $addAlertCheckbox.prop('checked', false).prop('disabled', true);
-        }
-    });
-    $('.js-contribute-as').change();
-  },
-
   on_resize: function() {
     var last_type;
     $(window).on('resize', function() {
@@ -737,86 +552,6 @@ $.extend(fixmystreet.set_up, {
     make_multi('filter_categories');
   },
 
-  report_page_inspect: function() {
-    if (!$('form#report_inspect_form').length) {
-        return;
-    }
-
-    // Focus on form
-    $('html,body').scrollTop($('#report_inspect_form').offset().top);
-
-    // On the manage/inspect report form, we already have all the extra inputs
-    // in the DOM, we just need to hide/show them as appropriate.
-    $('form#report_inspect_form [name=category]').change(function() {
-        var category = $(this).val(),
-            selector = "[data-category='" + category + "']";
-        $("form#report_inspect_form [data-category]:not(" + selector + ")").addClass("hidden");
-        $("form#report_inspect_form " + selector).removeClass("hidden");
-        // And update the associated priority list
-        var priorities = $("form#report_inspect_form " + selector).data('priorities');
-        var $select = $('#problem_priority'),
-            curr_pri = $select.val();
-        $select.find('option:gt(0)').remove();
-        $.each(priorities.split('&'), function(i, kv) {
-            if (!kv) {
-                return;
-            }
-            kv = kv.split('=', 2);
-            $select.append($('<option>', { value: kv[0], text: decodeURIComponent(kv[1]) }));
-        });
-        $select.val(curr_pri);
-    });
-
-    // The inspect form submit button can change depending on the selected state
-    $("#report_inspect_form [name=state]").change(function(){
-        var state = $(this).val();
-        var $inspect_form = $("#report_inspect_form");
-        var $submit = $inspect_form.find("input[type=submit]");
-        var value = $submit.attr('data-value-'+state);
-        if (value !== undefined) {
-            $submit.val(value);
-        } else {
-            $submit.val($submit.data('valueOriginal'));
-        }
-
-        // We might also have a response template to preselect for the new state
-        var $select = $inspect_form.find("select.js-template-name");
-        var $option = $select.find("option[data-problem-state='"+state+"']").first();
-        if ($option.length) {
-            $select.val($option.val()).change();
-        }
-    }).change();
-
-    $('.js-toggle-public-update').each(function() {
-        var $checkbox = $(this);
-        var toggle_public_update = function() {
-            if ($checkbox.prop('checked')) {
-                $('#public_update').parents('p').show();
-            } else {
-                $('#public_update').parents('p').hide();
-            }
-        };
-        $checkbox.on('change', function() {
-            toggle_public_update();
-        });
-        toggle_public_update();
-    });
-
-    if (geo_position_js.init()) {
-        fixmystreet.geolocate.setup(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));
-            $("form#report_inspect_form input[name=latitude]").val(latlon.lat);
-            $("form#report_inspect_form input[name=longitude]").val(latlon.lon);
-        });
-    }
-  },
-
   mobile_ui_tweaks: function() {
     //move 'skip this step' link on mobile
     $('.mobile #skip-this-step').addClass('chevron').wrap('<li>').parent().appendTo('#key-tools');
@@ -1064,75 +799,8 @@ $.extend(fixmystreet.set_up, {
             }
         });
     });
-  },
-
-  moderation: function() {
-      function toggle_original ($input, revert) {
-          $input.prop('disabled', revert);
-          if (revert) {
-              $input.data('currentValue', $input.val());
-          }
-          $input.val($input.data(revert ? 'originalValue' : 'currentValue'));
-      }
-
-      function add_handlers (elem, word) {
-          elem.each( function () {
-              var $elem = $(this);
-              $elem.find('.js-moderate').on('click', function () {
-                  $elem.find('.moderate-display').hide();
-                  $elem.find('.moderate-edit').show();
-              });
-
-              $elem.find('.revert-title').change( function () {
-                  toggle_original($elem.find('input[name=problem_title]'), $(this).prop('checked'));
-              });
-
-              $elem.find('.revert-textarea').change( function () {
-                  toggle_original($elem.find('textarea'), $(this).prop('checked'));
-              });
-
-              var hide_document = $elem.find('.hide-document');
-              hide_document.change( function () {
-                  $elem.find('input[name=problem_title]').prop('disabled', $(this).prop('checked'));
-                  $elem.find('textarea').prop('disabled', $(this).prop('checked'));
-                  $elem.find('input[type=checkbox]').prop('disabled', $(this).prop('checked'));
-                  $(this).prop('disabled', false); // in case disabled above
-              });
-
-              $elem.find('.cancel').click( function () {
-                  $elem.find('.moderate-display').show();
-                  $elem.find('.moderate-edit').hide();
-              });
-
-              $elem.find('form').submit( function () {
-                  if (hide_document.prop('checked')) {
-                      return confirm('This will hide the ' + word + ' completely!  (You will not be able to undo this without contacting support.)');
-                  }
-                  return true;
-              });
-          });
-      }
-      add_handlers( $('.problem-header'), 'problem' );
-      add_handlers( $('.item-list__item--updates'), 'update' );
-  },
-
-  response_templates: function() {
-      // If the user has manually edited the contents of an update field,
-      // mark it as dirty so it doesn't get clobbered if we select another
-      // response template. If the field is empty, it's not considered dirty.
-      $('.js-template-name').each(function() {
-          var $input = $('#' + $(this).data('for'));
-          $input.change(function() { $(this).data('dirty', !/^\s*$/.test($(this).val())); });
-      });
-
-      $('.js-template-name').change(function() {
-          var $this = $(this);
-          var $input = $('#' + $this.data('for'));
-          if (!$input.data('dirty')) {
-              $input.val($this.val());
-          }
-      });
   }
+
 });
 
 // The new location will be saved to a history state unless
@@ -1328,8 +996,8 @@ fixmystreet.display = {
             if ($twoColReport.length) {
                 $twoColReport.appendTo('#map_sidebar');
                 $('body').addClass('with-actions');
-                fixmystreet.set_up.report_page_inspect();
-                fixmystreet.set_up.manage_duplicates();
+                fixmystreet.run(fixmystreet.set_up.report_page_inspect);
+                fixmystreet.run(fixmystreet.set_up.manage_duplicates);
             } else {
                 $sideReport.appendTo('#map_sidebar');
             }
@@ -1371,8 +1039,8 @@ fixmystreet.display = {
             fixmystreet.set_up.fancybox_images();
             fixmystreet.set_up.dropzone($sideReport);
             fixmystreet.set_up.form_focus_triggers();
-            fixmystreet.set_up.moderation();
-            fixmystreet.set_up.response_templates();
+            fixmystreet.run(fixmystreet.set_up.moderation);
+            fixmystreet.run(fixmystreet.set_up.response_templates);
 
             window.selected_problem_id = reportId;
             var marker = fixmystreet.maps.get_marker_by_id(reportId);
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
new file mode 100644
index 000000000..9825a37ea
--- /dev/null
+++ b/web/cobrands/fixmystreet/staff.js
@@ -0,0 +1,342 @@
+$.extend(fixmystreet.set_up, {
+  manage_duplicates: function() {
+      // Deal with changes to report state by inspector/other staff, specifically
+      // displaying nearby reports if it's changed to 'duplicate'.
+      function refresh_duplicate_list() {
+          var report_id = $("#report_inspect_form .js-report-id").text();
+          var args = {
+              filter_category: $("#report_inspect_form select#category").val(),
+              latitude: $('input[name="latitude"]').val(),
+              longitude: $('input[name="longitude"]').val()
+          };
+          $("#js-duplicate-reports ul").html("<li>Loading...</li>");
+          var nearby_url = '/report/'+report_id+'/nearby.json';
+          $.getJSON(nearby_url, args, function(data) {
+              var duplicate_of = $("#report_inspect_form [name=duplicate_of]").val();
+              var $reports = $(data.current)
+                              .filter("li")
+                              .not("[data-report-id="+report_id+"]")
+                              .slice(0, 5);
+              $reports.filter("[data-report-id="+duplicate_of+"]").addClass("item-list--reports__item--selected");
+
+              (function() {
+                  var timeout;
+                  $reports.on('mouseenter', function(){
+                      clearTimeout(timeout);
+                      fixmystreet.maps.markers_highlight(parseInt($(this).data('reportId'), 10));
+                  }).on('mouseleave', function(){
+                      timeout = setTimeout(fixmystreet.maps.markers_highlight, 50);
+                  });
+              })();
+
+              $("#js-duplicate-reports ul").empty().prepend($reports);
+
+              $reports.find("a").click(function() {
+                  var report_id = $(this).closest("li").data('reportId');
+                  $("#report_inspect_form [name=duplicate_of]").val(report_id);
+                  $("#js-duplicate-reports ul li").removeClass("item-list--reports__item--selected");
+                  $(this).closest("li").addClass("item-list--reports__item--selected");
+                  return false;
+              });
+
+              show_nearby_pins(data, report_id);
+          });
+      }
+
+      function show_nearby_pins(data, report_id) {
+          var markers = fixmystreet.maps.markers_list( data.pins, true );
+          // We're replacing all the features in the markers layer with the
+          // possible duplicates, but the list of pins from the server doesn't
+          // include the current report. So we need to extract the feature for
+          // the current report and include it in the list of features we're
+          // showing on the layer.
+          var report_marker = fixmystreet.maps.get_marker_by_id(parseInt(report_id, 10));
+          if (report_marker) {
+              markers.unshift(report_marker);
+          }
+          fixmystreet.markers.removeAllFeatures();
+          fixmystreet.markers.addFeatures( markers );
+      }
+
+      function state_change() {
+          // The duplicate report list only makes sense when state is 'duplicate'
+          if ($(this).val() !== "duplicate") {
+              $("#js-duplicate-reports").addClass("hidden");
+              return;
+          } else {
+              $("#js-duplicate-reports").removeClass("hidden");
+          }
+          // If this report is already marked as a duplicate of another, then
+          // there's no need to refresh the list of duplicate reports
+          var duplicate_of = $("#report_inspect_form [name=duplicate_of]").val();
+          if (!!duplicate_of) {
+              return;
+          }
+
+          refresh_duplicate_list();
+      }
+
+      $("#report_inspect_form").on("change.state", "select#state", state_change);
+      $("#js-change-duplicate-report").click(refresh_duplicate_list);
+  },
+
+  list_item_actions: function() {
+    function toggle_shortlist(btn, sw, id) {
+        btn.attr('class', 'item-list__item__shortlist-' + sw);
+        btn.attr('title', btn.data('label-' + sw));
+        if (id) {
+            sw += '-' + id;
+        }
+        btn.attr('name', 'shortlist-' + sw);
+    }
+
+    $('.item-list--reports').on('click', ':submit', function(e) {
+      e.preventDefault();
+
+      var $submitButton = $(this);
+      var whatUserWants = $submitButton.prop('name');
+      var data;
+      var $item;
+      var $list;
+      var $hiddenInput;
+      var report_id;
+      if (fixmystreet.page === 'around') {
+          // Deal differently because one big form
+          var parts = whatUserWants.split('-');
+          whatUserWants = parts[0] + '-' + parts[1];
+          report_id = parts[2];
+          var token = $('[name=token]').val();
+          data = whatUserWants + '=1&token=' + token + '&id=' + report_id;
+      } else {
+          var $form = $(this).parents('form');
+          $item = $form.parent('.item-list__item');
+          $list = $item.parent('.item-list');
+
+          // The server expects to be told which button/input triggered the form
+          // submission. But $form.serialize() doesn't know that. So we inject a
+          // hidden input into the form, that can pass the name and value of the
+          // submit button to the server, as it expects.
+          $hiddenInput = $('<input>').attr({
+            type: 'hidden',
+            name: whatUserWants,
+            value: $submitButton.prop('value')
+          }).appendTo($form);
+          data = $form.serialize() + '&ajax=1';
+      }
+
+      // Update UI while the ajax request is sent in the background.
+      if ('shortlist-down' === whatUserWants) {
+        $item.insertAfter( $item.next() );
+      } else if ('shortlist-up' === whatUserWants) {
+        $item.insertBefore( $item.prev() );
+      } else if ('shortlist-remove' === whatUserWants) {
+          toggle_shortlist($submitButton, 'add', report_id);
+      } else if ('shortlist-add' === whatUserWants) {
+          toggle_shortlist($submitButton, 'remove', report_id);
+      }
+
+      // Items have moved around. We need to make sure the "up" button on the
+      // first item, and the "down" button on the last item, are disabled.
+      fixmystreet.update_list_item_buttons($list);
+
+      $.ajax({
+        url: '/my/planned/change',
+        type: 'POST',
+        data: data
+      }).fail(function() {
+        // Undo the UI changes we made.
+        if ('shortlist-down' === whatUserWants) {
+          $item.insertBefore( $item.prev() );
+        } else if ('shortlist-up' === whatUserWants) {
+          $item.insertAfter( $item.next() );
+        } else if ('shortlist-remove' === whatUserWants) {
+          toggle_shortlist($submitButton, 'remove', report_id);
+        } else if ('shortlist-add' === whatUserWants) {
+          toggle_shortlist($submitButton, 'add', report_id);
+        }
+        fixmystreet.update_list_item_buttons($list);
+      }).complete(function() {
+        if ($hiddenInput) {
+          $hiddenInput.remove();
+        }
+      });
+    });
+  },
+
+  contribute_as: function() {
+    $('.content').on('change', '.js-contribute-as', function(){
+        var opt = this.options[this.selectedIndex],
+            val = opt.value,
+            txt = opt.text;
+        var $emailInput = $('input[name=email]').add('input[name=rznvy]');
+        var $nameInput = $('input[name=name]');
+        var $showNameCheckbox = $('input[name=may_show_name]');
+        var $addAlertCheckbox = $('#form_add_alert');
+        if (val === 'myself') {
+            $emailInput.val($emailInput.prop('defaultValue')).prop('disabled', true);
+            $nameInput.val($nameInput.prop('defaultValue')).prop('disabled', false);
+            $showNameCheckbox.prop('checked', false).prop('disabled', false);
+            $addAlertCheckbox.prop('checked', true).prop('disabled', false);
+        } else if (val === 'another_user') {
+            $emailInput.val('').prop('disabled', false);
+            $nameInput.val('').prop('disabled', false);
+            $showNameCheckbox.prop('checked', false).prop('disabled', true);
+            $addAlertCheckbox.prop('checked', true).prop('disabled', false);
+        } else if (val === 'body') {
+            $emailInput.val('-').prop('disabled', true);
+            $nameInput.val(txt).prop('disabled', true);
+            $showNameCheckbox.prop('checked', true).prop('disabled', true);
+            $addAlertCheckbox.prop('checked', false).prop('disabled', true);
+        }
+    });
+    $('.js-contribute-as').change();
+  },
+
+  report_page_inspect: function() {
+    if (!$('form#report_inspect_form').length) {
+        return;
+    }
+
+    // Focus on form
+    $('html,body').scrollTop($('#report_inspect_form').offset().top);
+
+    // On the manage/inspect report form, we already have all the extra inputs
+    // in the DOM, we just need to hide/show them as appropriate.
+    $('form#report_inspect_form [name=category]').change(function() {
+        var category = $(this).val(),
+            selector = "[data-category='" + category + "']";
+        $("form#report_inspect_form [data-category]:not(" + selector + ")").addClass("hidden");
+        $("form#report_inspect_form " + selector).removeClass("hidden");
+        // And update the associated priority list
+        var priorities = $("form#report_inspect_form " + selector).data('priorities');
+        var $select = $('#problem_priority'),
+            curr_pri = $select.val();
+        $select.find('option:gt(0)').remove();
+        $.each(priorities.split('&'), function(i, kv) {
+            if (!kv) {
+                return;
+            }
+            kv = kv.split('=', 2);
+            $select.append($('<option>', { value: kv[0], text: decodeURIComponent(kv[1]) }));
+        });
+        $select.val(curr_pri);
+    });
+
+    // The inspect form submit button can change depending on the selected state
+    $("#report_inspect_form [name=state]").change(function(){
+        var state = $(this).val();
+        var $inspect_form = $("#report_inspect_form");
+        var $submit = $inspect_form.find("input[type=submit]");
+        var value = $submit.attr('data-value-'+state);
+        if (value !== undefined) {
+            $submit.val(value);
+        } else {
+            $submit.val($submit.data('valueOriginal'));
+        }
+
+        // We might also have a response template to preselect for the new state
+        var $select = $inspect_form.find("select.js-template-name");
+        var $option = $select.find("option[data-problem-state='"+state+"']").first();
+        if ($option.length) {
+            $select.val($option.val()).change();
+        }
+    }).change();
+
+    $('.js-toggle-public-update').each(function() {
+        var $checkbox = $(this);
+        var toggle_public_update = function() {
+            if ($checkbox.prop('checked')) {
+                $('#public_update').parents('p').show();
+            } else {
+                $('#public_update').parents('p').hide();
+            }
+        };
+        $checkbox.on('change', function() {
+            toggle_public_update();
+        });
+        toggle_public_update();
+    });
+
+    if (geo_position_js.init()) {
+        fixmystreet.geolocate.setup(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));
+            $("form#report_inspect_form input[name=latitude]").val(latlon.lat);
+            $("form#report_inspect_form input[name=longitude]").val(latlon.lon);
+        });
+    }
+  },
+
+  moderation: function() {
+      function toggle_original ($input, revert) {
+          $input.prop('disabled', revert);
+          if (revert) {
+              $input.data('currentValue', $input.val());
+          }
+          $input.val($input.data(revert ? 'originalValue' : 'currentValue'));
+      }
+
+      function add_handlers (elem, word) {
+          elem.each( function () {
+              var $elem = $(this);
+              $elem.find('.js-moderate').on('click', function () {
+                  $elem.find('.moderate-display').hide();
+                  $elem.find('.moderate-edit').show();
+              });
+
+              $elem.find('.revert-title').change( function () {
+                  toggle_original($elem.find('input[name=problem_title]'), $(this).prop('checked'));
+              });
+
+              $elem.find('.revert-textarea').change( function () {
+                  toggle_original($elem.find('textarea'), $(this).prop('checked'));
+              });
+
+              var hide_document = $elem.find('.hide-document');
+              hide_document.change( function () {
+                  $elem.find('input[name=problem_title]').prop('disabled', $(this).prop('checked'));
+                  $elem.find('textarea').prop('disabled', $(this).prop('checked'));
+                  $elem.find('input[type=checkbox]').prop('disabled', $(this).prop('checked'));
+                  $(this).prop('disabled', false); // in case disabled above
+              });
+
+              $elem.find('.cancel').click( function () {
+                  $elem.find('.moderate-display').show();
+                  $elem.find('.moderate-edit').hide();
+              });
+
+              $elem.find('form').submit( function () {
+                  if (hide_document.prop('checked')) {
+                      return confirm('This will hide the ' + word + ' completely!  (You will not be able to undo this without contacting support.)');
+                  }
+                  return true;
+              });
+          });
+      }
+      add_handlers( $('.problem-header'), 'problem' );
+      add_handlers( $('.item-list__item--updates'), 'update' );
+  },
+
+  response_templates: function() {
+    // If the user has manually edited the contents of an update field,
+    // mark it as dirty so it doesn't get clobbered if we select another
+    // response template. If the field is empty, it's not considered dirty.
+    $('.js-template-name').each(function() {
+        var $input = $('#' + $(this).data('for'));
+        $input.change(function() { $(this).data('dirty', !/^\s*$/.test($(this).val())); });
+    });
+
+    $('.js-template-name').change(function() {
+        var $this = $(this);
+        var $input = $('#' + $this.data('for'));
+        if (!$input.data('dirty')) {
+            $input.val($this.val());
+        }
+    });
+  }
+});
diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js
deleted file mode 100644
index 02eb30766..000000000
--- a/web/js/fixmystreet-admin.js
+++ /dev/null
@@ -1,125 +0,0 @@
-$(function(){
-    // available for admin pages
-
-    // hide the open311_only section and reveal it only when send_method is relevant
-    function hide_or_show_open311(e, hide_fast) {
-        var $form = $(this).closest("form");
-        var $open311_only = $form.find('.admin-open311-only');
-
-        var send_method = $(this).val();
-        var show_open311 = false;
-        if ($form.find('[name=endpoint]').val()) {
-            show_open311 = true; // always show the form if there is an endpoint value
-        } else if (send_method && !send_method.match(/^(email|noop|refused)$/i)) {
-            show_open311 = true;
-        }
-        if (show_open311) {
-            $open311_only.slideDown();
-        } else {
-            if (hide_fast) {
-                $open311_only.hide();
-            } else {
-                $open311_only.slideUp();
-            }
-        }
-    }
-
-    if ($('.admin-open311-only').length) {
-        // Add handler to send_method dropdowns and set initial visibility
-        $('[name=send_method]').on('change', hide_or_show_open311).each(function() {
-            hide_or_show_open311.call(this, null, true);
-        });
-    }
-
-    // Some lists of checkboxes have 'select all/none' links at the top
-    $("a[data-select-none], a[data-select-all]").click(function(e) {
-        e.preventDefault();
-        var checked = $(this).filter('[data-select-all]').length > 0;
-        $(this).closest("ul").find('input[type=checkbox]').prop('checked', checked);
-    });
-
-
-    // admin hints: maybe better implemented as tooltips?
-    $(".admin-hint").on('click', function(){
-        if ($(this).hasClass('admin-hint-show')) {
-            $(this).removeClass('admin-hint-show');
-        } else {
-            $(this).addClass('admin-hint-show');
-        }
-    });
-
-    // on a body's page, hide/show deleted contact categories
-    var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
-    if ($table_with_deleted_contacts.length == 1) {
-        var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
-        $table_with_deleted_contacts.before($toggle_deleted_btn);
-        $toggle_deleted_btn.on('click', function(e){
-            e.preventDefault();
-            var $cols = $table_with_deleted_contacts.find('tr.is-deleted');
-            if ($cols.first().is(':visible')) {
-                $cols.hide();
-                $(this).prop("value", 'Show deleted contacts');
-            } else {
-                $cols.show();
-                $(this).prop("value", 'Hide deleted contacts');
-            }
-        });
-    }
-
-    // On some cobrands the datepicker ends up beneath items in the header, e.g.
-    // the logo.
-    // This function sets an appropriate z-index when the datepicker is shown.
-    // Sadly there's no way to set the z-index when creating the datepicker, so
-    // we have to run this little helper using the datepicker beforeShow
-    // handler.
-    function fixZIndex() {
-        setTimeout(function() {
-            $('.ui-datepicker').css('z-index', 10);
-        }, 0);
-    }
-
-    $( "#start_date" ).datepicker({
-      defaultDate: "-1w",
-      changeMonth: true,
-      dateFormat: 'dd/mm/yy' ,
-      // This sets the other fields minDate to our date
-      onClose: function( selectedDate ) {
-        $( "#end_date" ).datepicker( "option", "minDate", selectedDate );
-      },
-      beforeShow: fixZIndex
-    });
-    $( "#end_date" ).datepicker({
-     /// defaultDate: "+1w",
-      changeMonth: true,
-      dateFormat: 'dd/mm/yy' ,
-      onClose: function( selectedDate ) {
-        $( "#start_date" ).datepicker( "option", "maxDate", selectedDate );
-      },
-      beforeShow: fixZIndex
-    });
-
-    // On user edit page, hide the area/categories fields if body changes
-    $("form#user_edit select#body").change(function() {
-        var show_area = $(this).val() == $(this).find("[data-originally-selected]").val();
-        $("form#user_edit select#area_id").closest("li").toggle(show_area);
-        $("form#user_edit .js-user-categories").toggle(show_area);
-    });
-
-    // On category edit page, hide the reputation input if inspection isn't required
-    $("form#category_edit #inspection_required").change(function() {
-        var $p = $("form#category_edit #reputation_threshold").closest("p");
-        var $hint = $p.prevUntil().first();
-        if (this.checked) {
-            $p.removeClass("hidden");
-            if ($hint.length) {
-                $hint.removeClass("hidden");
-            }
-        } else {
-            $p.addClass("hidden");
-            if ($hint.length) {
-                $hint.addClass("hidden");
-            }
-        }
-    });
-});
-
-- 
cgit v1.2.3


From a91d9562c6c0ec836f10290df779e2012f18ddec Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 Mar 2017 17:58:31 +0000
Subject: Add is_in_progress Problem helper.

---
 perllib/FixMyStreet/DB/Result/Problem.pm         | 10 ++++++++++
 t/app/model/problem.t                            | 16 ++++++++++++++++
 templates/web/base/report/banner.html            |  3 +--
 templates/web/fixmystreet.com/report/banner.html |  3 +--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index dcd5ecc71..0ab52628e 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -549,6 +549,16 @@ sub is_open {
     return exists $self->open_states->{ $self->state } ? 1 : 0;
 }
 
+=head2 is_in_progress
+
+Sees if the problem is in an open, not 'confirmed' state.
+
+=cut
+
+sub is_in_progress {
+    my $self = shift;
+    return $self->is_open && $self->state ne 'confirmed' ? 1 : 0;
+}
 
 =head2 is_fixed
 
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index b942a5333..e9ec22b77 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -249,6 +249,7 @@ for my $test (
         is_visible  => 0,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -256,6 +257,7 @@ for my $test (
         is_visible => 0,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -263,6 +265,7 @@ for my $test (
         is_visible => 0,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -270,6 +273,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 1,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -277,6 +281,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 1,
+        is_in_progress => 1,
         is_closed   => 0,
     },
     {
@@ -284,6 +289,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 1,
+        is_in_progress => 1,
         is_closed   => 0,
     },
     {
@@ -291,6 +297,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 1,
+        is_in_progress => 1,
         is_closed   => 0,
     },
     {
@@ -298,6 +305,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 1,
+        is_in_progress => 1,
         is_closed   => 0,
     },
     {
@@ -305,6 +313,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 1,
     },
     {
@@ -312,6 +321,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 1,
     },
     {
@@ -319,6 +329,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 1,
     },
     {
@@ -326,6 +337,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 1,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -333,6 +345,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 1,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -340,6 +353,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 1,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 0,
     },
     {
@@ -347,6 +361,7 @@ for my $test (
         is_visible => 1,
         is_fixed    => 0,
         is_open     => 0,
+        is_in_progress => 0,
         is_closed   => 1,
     },
 ) {
@@ -356,6 +371,7 @@ for my $test (
         is $problem->is_fixed, $test->{is_fixed}, 'is_fixed';
         is $problem->is_closed, $test->{is_closed}, 'is_closed';
         is $problem->is_open, $test->{is_open}, 'is_open';
+        is $problem->is_in_progress, $test->{is_in_progress}, 'is_in_progress';
     };
 }
 
diff --git a/templates/web/base/report/banner.html b/templates/web/base/report/banner.html
index 188e96502..c80d129eb 100644
--- a/templates/web/base/report/banner.html
+++ b/templates/web/base/report/banner.html
@@ -14,7 +14,6 @@
 [% IF problem.is_closed %]
     [% INCLUDE banner, id = 'closed', text = loc('Closed') %]
 [% END %]
-[% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ];
-   IF states.grep(problem.state).size %]
+[% IF problem.is_in_progress %]
     [% INCLUDE banner, id = 'progress', text = loc('In progress') %]
 [% END %]
diff --git a/templates/web/fixmystreet.com/report/banner.html b/templates/web/fixmystreet.com/report/banner.html
index 35d7be179..6fd74a7fe 100644
--- a/templates/web/fixmystreet.com/report/banner.html
+++ b/templates/web/fixmystreet.com/report/banner.html
@@ -20,8 +20,7 @@
         [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %]
     [% END %]
 
-    [% states = [ 'investigating', 'in progress', 'planned', 'action scheduled' ];
-       IF states.grep(problem.state).size %]
+    [% IF problem.is_in_progress %]
         [% INCLUDE banner, id = 'progress', text = loc('In progress') %]
     [% END %]
 
-- 
cgit v1.2.3


From 45186b5f25cc6ece26c5d7d92a78ab2b75f6d05b Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 Mar 2017 18:04:19 +0000
Subject: Set up correct environment in cobrand PO script.

Uses the same environment as gettext-extract.
---
 bin/generate_cobrand_po | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/bin/generate_cobrand_po b/bin/generate_cobrand_po
index 1770de7c2..8e62230ae 100755
--- a/bin/generate_cobrand_po
+++ b/bin/generate_cobrand_po
@@ -13,14 +13,22 @@ the main FixMyStreet po files
 
 =cut
 
-my $cobrand = shift;
+use File::Basename qw(dirname);
+use File::Spec;
 
+my $cobrand = shift;
 die "Please provide a cobrand name\n" unless $cobrand;
 
-my $cobrand_lc = lc( $cobrand );
+my $d = dirname(dirname(File::Spec->rel2abs($0)));
+chdir $d;
 
-my $PO = "locale/$cobrand.po";
+# Install required code if needed
+system("vendor/bin/carton install --path local-gettext --cpanfile locale/cpanfile --deployment");
+$ENV{PATH} = "local-gettext/bin:$ENV{PATH}";
+$ENV{PERL5LIB} = "local-gettext/lib/perl5:local/lib/perl5";
 
+my $cobrand_lc = lc( $cobrand );
+my $PO = "locale/$cobrand.po";
 my $cobrand_module = "perllib/FixMyStreet/Cobrand/$cobrand.pm";
 my $web_templates = "templates/web/$cobrand_lc/";
 
-- 
cgit v1.2.3


From 57e5cd72ed7fe2f8b9c72a1390a7ad37fd5cfcc2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 3 Mar 2017 18:06:20 +0000
Subject: Allow superuser to leave update when inspecting.

---
 perllib/FixMyStreet/App/Controller/Report.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 35d7afd5b..7cd9d32a0 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -419,12 +419,13 @@ sub inspect : Private {
                 if (my $saved_at = $c->get_param('saved_at')) {
                     $timestamp = DateTime->from_epoch( 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 => $c->user->from_body->name,
+                    name => $name,
                     state => 'confirmed',
                     mark_fixed => 0,
                     anonymous => 0,
-- 
cgit v1.2.3


From 8b19bd2c900e94b1dff643211a4b3a93c8718c27 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 10 Mar 2017 18:04:04 +0000
Subject: Be clearer if no states selected is not all states

As with 1115f106, a default might not be everything.
---
 templates/web/base/reports/_list-filters.html | 6 +++++-
 web/cobrands/fixmystreet/fixmystreet.js       | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 61a44629d..ce4666156 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,6 +1,10 @@
 [% select_status = BLOCK %]
     <select class="form-control js-multiple" name="status" id="statuses" multiple
-      data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]'>
+      data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]'
+    [%~ IF c.cobrand.on_map_default_status == 'open' %]
+      data-none="[% loc('Unfixed reports') %]"
+    [%~ END ~%]
+      >
       [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %]
         <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option>
         <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index aa89f8115..db61bd008 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -538,10 +538,11 @@ $.extend(fixmystreet.set_up, {
     function make_multi(id) {
         var $id = $('#' + id),
             all = $id.data('all'),
+            none = $id.data('none') || all,
             allOpts = $id.data('allOptions') || [];
         $id.multiSelect({
             allText: all,
-            noneText: all,
+            noneText: none,
             positionMenuWithin: $('#side'),
             presets: [{
                 name: all,
-- 
cgit v1.2.3


From 7361516252a4d98620f66318cabe75acb3291efb Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 9 Mar 2017 10:43:27 +0000
Subject: Remove duplicate <> around envelope senders.

---
 perllib/FixMyStreet/Email.pm            | 4 ++++
 perllib/FixMyStreet/Script/Alerts.pm    | 6 +-----
 perllib/FixMyStreet/SendReport/Email.pm | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm
index 7d81c9dc5..e0d82a8ef 100644
--- a/perllib/FixMyStreet/Email.pm
+++ b/perllib/FixMyStreet/Email.pm
@@ -77,6 +77,10 @@ sub _render_template {
     return $var;
 }
 
+sub unique_verp_id {
+    sprintf('fms-%s@%s', generate_verp_token(@_), FixMyStreet->config('EMAIL_DOMAIN'));
+}
+
 sub _unique_id {
     sprintf('fms-%s-%s@%s',
         time(), unpack('h*', random_bytes(5, 1)),
diff --git a/perllib/FixMyStreet/Script/Alerts.pm b/perllib/FixMyStreet/Script/Alerts.pm
index 65183c09c..1a760a0c1 100644
--- a/perllib/FixMyStreet/Script/Alerts.pm
+++ b/perllib/FixMyStreet/Script/Alerts.pm
@@ -283,11 +283,7 @@ sub _send_aggregated_alert_email(%) {
     } );
     $data{unsubscribe_url} = $cobrand->base_url( $data{cobrand_data} ) . '/A/' . $token->token;
 
-    my $sender = sprintf('<fms-%s@%s>',
-        FixMyStreet::Email::generate_verp_token('alert', $data{alert_id}),
-        FixMyStreet->config('EMAIL_DOMAIN')
-    );
-
+    my $sender = FixMyStreet::Email::unique_verp_id('alert', $data{alert_id});
     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 5a287a208..8fedc48b5 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -88,10 +88,7 @@ sub send {
 
     $params->{Bcc} = $self->bcc if @{$self->bcc};
 
-    my $sender = sprintf('<fms-%s@%s>',
-        FixMyStreet::Email::generate_verp_token('report', $row->id),
-        FixMyStreet->config('EMAIL_DOMAIN')
-    );
+    my $sender = FixMyStreet::Email::unique_verp_id('report', $row->id);
 
     if (FixMyStreet::Email::test_dmarc($params->{From}[0])) {
         $params->{'Reply-To'} = [ $params->{From} ];
-- 
cgit v1.2.3


From 74a7ed654369cb3ebd282c01d4a0de87a646c4ce Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 8 Mar 2017 14:13:48 +0000
Subject: Use sender in From if From and To domains match.

To deal with a recipient mail server not allowing inbound email
using the same domain as an internal domain, e.g.
https://community.mimecast.com/docs/DOC-1419
---
 perllib/FixMyStreet/SendReport/Email.pm |  4 +++-
 perllib/Utils/Email.pm                  | 12 ++++++++++++
 t/app/model/problem.t                   | 18 +++++++++++++-----
 t/cobrand/zurich.t                      |  8 ++++----
 t/cobrand/zurich_attachments.txt        |  2 +-
 t/utils/email.t                         |  3 +++
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 8fedc48b5..9abccf510 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -2,6 +2,7 @@ package FixMyStreet::SendReport::Email;
 
 use Moo;
 use FixMyStreet::Email;
+use Utils::Email;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
@@ -90,7 +91,8 @@ sub send {
 
     my $sender = FixMyStreet::Email::unique_verp_id('report', $row->id);
 
-    if (FixMyStreet::Email::test_dmarc($params->{From}[0])) {
+    if (FixMyStreet::Email::test_dmarc($params->{From}[0])
+      || Utils::Email::same_domain($params->{From}, $params->{To})) {
         $params->{'Reply-To'} = [ $params->{From} ];
         $params->{From} = [ $sender, $params->{From}[1] ];
     }
diff --git a/perllib/Utils/Email.pm b/perllib/Utils/Email.pm
index a30e41c61..5e3df0205 100644
--- a/perllib/Utils/Email.pm
+++ b/perllib/Utils/Email.pm
@@ -34,4 +34,16 @@ sub _send {
     return grep { $_->type eq $type } @answers;
 }
 
+sub same_domain {
+    my ($email, $list) = @_;
+    my $addr = (Email::Address->parse($email->[0]))[0];
+    return unless $addr;
+    my $domain = $addr->host;
+    foreach (@$list) {
+        my $addr = (Email::Address->parse($_->[0]))[0];
+        next unless $addr;
+        return 1 if $domain eq $addr->host;
+    }
+}
+
 1;
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index e9ec22b77..6b1be0a76 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -148,7 +148,7 @@ for my $test (
 
 my $user = FixMyStreet::DB->resultset('User')->find_or_create(
     {
-        email => 'system_user@example.com'
+        email => 'system_user@example.net'
     }
 );
 
@@ -428,7 +428,7 @@ for my $contact ( {
 }, {
     body_id => $body_ids{14279}[0], # Ballymoney
     category => 'Graffiti',
-    email => 'highways@example.com',
+    email => 'highways@example.net',
 }, {
     confirmed => 0,
     body_id => $body_ids{2636}, # Isle of Wight
@@ -439,7 +439,7 @@ for my $contact ( {
 }
 
 my %common = (
-    email => 'system_user@example.com',
+    email => 'system_user@example.net',
     name => 'Andrew Smith',
 );
 foreach my $test ( {
@@ -505,6 +505,9 @@ foreach my $test ( {
         body          => $body_ids{14279}[0],
         category      => 'Graffiti',
         longitude => -6.5,
+        # As Ballmoney contact has same domain as reporter, the From line will
+        # become a unique reply address and Reply-To will become the reporter
+        reply_to => 1,
     }, {
         %common,
         desc          => 'directs NI correctly, 2',
@@ -563,7 +566,12 @@ foreach my $test ( {
         if ( $test->{ email_count } ) {
             my $email = $mech->get_email;
             like $email->header('To'), $test->{ to }, 'to line looks correct';
-            is $email->header('From'), sprintf('"%s" <%s>', $test->{ name }, $test->{ email } ), 'from line looks correct';
+            if ($test->{reply_to}) {
+                is $email->header('Reply-To'), sprintf('"%s" <%s>', $test->{ name }, $test->{ email } ), 'Reply-To line looks correct';
+                like $email->header('From'), qr/"$test->{name}" <fms-report-\d+-\w+\@example.org>/, 'from line looks correct';
+            } else {
+                is $email->header('From'), sprintf('"%s" <%s>', $test->{ name }, $test->{ email } ), 'from line looks correct';
+            }
             like $email->header('Subject'), qr/A Title/, 'subject line looks correct';
             my $body = $mech->get_text_body_from_email($email);
             like $body, qr/A user of FixMyStreet/, 'email body looks a bit like a report';
@@ -671,7 +679,7 @@ subtest 'check can turn on report sent email alerts' => sub {
     my $email = $emails[0];
 
     like $email->header('To'),qr/City of Edinburgh Council/, 'to line looks correct';
-    is $email->header('From'), '"Test User" <system_user@example.com>', 'from line looks correct';
+    is $email->header('From'), '"Test User" <system_user@example.net>', 'from line looks correct';
     like $email->header('Subject'), qr/A Title/, 'subject line looks correct';
     my $body = $mech->get_text_body_from_email($email);
     like $body, qr/A user of FixMyStreet/, 'email body looks a bit like a report';
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 85cada27a..0a84d2d03 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -82,7 +82,7 @@ $subdivision->endpoint( 'subdivision@example.org' );
 $subdivision->update;
 my $external_body = $mech->create_body_ok( 4, 'External Body' );
 $external_body->send_method( 'Zurich' );
-$external_body->endpoint( 'external_body@example.org' );
+$external_body->endpoint( 'external_body@example.net' );
 $external_body->update;
 
 sub get_export_rows_count {
@@ -563,7 +563,7 @@ subtest "external report triggers email" => sub {
     send_reports_for_zurich();
     $email = $mech->get_email;
     like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay';
-    like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct';
+    like $email->header('To'), qr/external_body\@example.net/, 'to line looks correct';
     like $email->body, qr/External Body/, 'body has right name';
     like $email->body, qr/$EXTERNAL_MESSAGE/, 'external_message was passed on';
     unlike $email->body, qr/test\@example.com/, 'body does not contain email address';
@@ -599,7 +599,7 @@ subtest "external report triggers email" => sub {
         send_reports_for_zurich();
         $email = $mech->get_email;
         like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay';
-        like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct';
+        like $email->header('To'), qr/external_body\@example.net/, 'to line looks correct';
         like $email->body, qr/External Body/, 'body has right name';
         like $email->body, qr/test\@example.com/, 'body does contain email address';
         $mech->clear_emails_ok;
@@ -630,7 +630,7 @@ subtest "external report triggers email" => sub {
         send_reports_for_zurich();
         $email = $mech->get_email;
         like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay';
-        like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct';
+        like $email->header('To'), qr/external_body\@example.net/, 'to line looks correct';
         like $email->body, qr/External Body/, 'body has right name';
         like $email->body, qr/$EXTERNAL_MESSAGE/, 'external_message was passed on';
         like $email->body, qr/test\@example.com/, 'body contains email address';
diff --git a/t/cobrand/zurich_attachments.txt b/t/cobrand/zurich_attachments.txt
index bf8d6872b..25a1bacf0 100644
--- a/t/cobrand/zurich_attachments.txt
+++ b/t/cobrand/zurich_attachments.txt
@@ -1,7 +1,7 @@
 MIME-Version: 1.0
 Subject: =?iso-8859-1?Q?Z=FCri?= wie neu: Weitergeleitete Meldung #REPORT_ID
 Content-Type: multipart/mixed; boundary="BOUNDARY"
-To: "External Body" <external_body@example.org>
+To: "External Body" <external_body@example.net>
 Content-Transfer-Encoding: 7bit
 From: "FixMyStreet" <division@example.org>
 
diff --git a/t/utils/email.t b/t/utils/email.t
index 23814c1d7..9e556a865 100644
--- a/t/utils/email.t
+++ b/t/utils/email.t
@@ -31,4 +31,7 @@ is Utils::Email::test_dmarc('BAD'), undef;
 is Utils::Email::test_dmarc('test@yahoo.com'), 1;
 is Utils::Email::test_dmarc('test@example.net'), undef;
 
+is Utils::Email::same_domain(['test@example.net', ''], [ ['to@example.net', ''], ['to@example.com', ''] ]), 1;
+is Utils::Email::same_domain(['test@example.org', ''], [ ['to@example.net', ''] ]), '';
+
 done_testing();
-- 
cgit v1.2.3


From ecb6c0373a36b182fbc671602946805d64dcf679 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 7 Mar 2017 16:51:05 +0000
Subject: Store user object when deleting report.

---
 perllib/FixMyStreet/App/Controller/Report.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 7cd9d32a0..27f4393bb 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -275,7 +275,8 @@ sub delete :Local :Args(1) {
     $p->user->update_reputation(-1);
 
     $c->model('DB::AdminLog')->create( {
-        admin_user => $c->user->email,
+        user => $c->user,
+        admin_user => $c->user->from_body->name,
         object_type => 'problem',
         action => 'state_change',
         object_id => $id,
-- 
cgit v1.2.3


From 4ad523ad6a4950f91301e896b8f6a3d8e23afc06 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 7 Mar 2017 16:46:38 +0000
Subject: Use name at time of moderation, include superusers

This works better if e.g. a user stops being associated with a body.
---
 perllib/FixMyStreet/App/Controller/Moderate.pm |  9 +++++++--
 t/app/controller/moderate.t                    | 18 ++++++++++++++++++
 templates/web/base/report/_main.html           |  2 +-
 templates/web/base/report/update.html          |  2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index 94e6cd62a..74f2e6b31 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -83,6 +83,11 @@ sub moderate_report : Chained('report') : PathPart('') : Args(0) {
     $c->detach( 'report_moderate_audit', \@types )
 }
 
+sub moderating_user_name {
+    my $user = shift;
+    return $user->from_body ? $user->from_body->name : 'a FixMyStreet administrator';
+}
+
 sub report_moderate_audit : Private {
     my ($self, $c, @types) = @_;
 
@@ -95,7 +100,7 @@ sub report_moderate_audit : Private {
     $c->model('DB::AdminLog')->create({
         action => 'moderation',
         user => $user,
-        admin_user => $user->name,
+        admin_user => moderating_user_name($user),
         object_id => $problem->id,
         object_type => 'problem',
         reason => (sprintf '%s (%s)', $reason, $types_csv),
@@ -249,7 +254,7 @@ sub update_moderate_audit : Private {
     $c->model('DB::AdminLog')->create({
         action => 'moderation',
         user => $user,
-        admin_user => $user->name,
+        admin_user => moderating_user_name($user),
         object_id => $comment->id,
         object_type => 'update',
         reason => (sprintf '%s (%s)', $reason, $types_csv),
diff --git a/t/app/controller/moderate.t b/t/app/controller/moderate.t
index 3a3c7a708..10287ab22 100644
--- a/t/app/controller/moderate.t
+++ b/t/app/controller/moderate.t
@@ -101,6 +101,7 @@ subtest 'Problem moderation' => sub {
             problem_detail => 'Good good improved',
         }});
         $mech->base_like( qr{\Q$REPORT_URL\E} );
+        $mech->content_like(qr/Moderated by Bromley Council/);
 
         $report->discard_changes;
         is $report->title, 'Good [...] good';
@@ -330,6 +331,23 @@ subtest 'Update 2' => sub {
     is $update2->text, 'update good good [...] good',
 };
 
+subtest 'Now stop being a staff user' => sub {
+    $user->update({ from_body => undef });
+    $mech->get_ok($REPORT_URL);
+    $mech->content_contains('Moderated by Bromley Council');
+};
+
+subtest 'And do it as a superuser' => sub {
+    $user->update({ is_superuser => 1 });
+    $mech->get_ok($REPORT_URL);
+    $mech->submit_form_ok({ with_fields => {
+        %problem_prepopulated,
+        problem_title  => 'Good good',
+        problem_detail => 'Good good improved',
+    }});
+    $mech->content_contains('Moderated by a FixMyStreet administrator');
+};
+
 $update->delete;
 $update2->delete;
 $report->moderation_original_data->delete;
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 9431ef2ce..12733a992 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -66,7 +66,7 @@
 
     [% INCLUDE 'report/_main_sent_info.html' %]
     [% mlog = problem.latest_moderation_log_entry(); IF mlog %]
-        <p>Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]</p>
+        <p>Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %]</p>
     [% END %]
 
     [% INCLUDE 'report/_support.html' %]
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index d423a193d..752f20174 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -46,7 +46,7 @@
                     <p class="meta-2">
                         [% INCLUDE meta_line %]
                         [% mlog = update.latest_moderation_log_entry(); IF mlog %]
-                            <br /> Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]
+                            <br /> Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %]
                         [% END %]
                     </p>
                 </div>
-- 
cgit v1.2.3


From 7c62e5da36f84b156dbbce331da7ca3f7961f27f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 15 Mar 2017 13:57:05 +0000
Subject: Do upload_dir check on start up, not each report.

If we're chugging through a list of reports, this save on a lot of
pointless statting of the upload directory which we know is there.
---
 perllib/FixMyStreet/App.pm                | 9 ++++++++-
 perllib/FixMyStreet/App/Model/PhotoSet.pm | 9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 2fc560bc8..9660d327a 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -11,7 +11,7 @@ use FixMyStreet::Map;
 use FixMyStreet::Email;
 use Utils;
 
-use Path::Class;
+use Path::Tiny 'path';
 use URI;
 use URI::QueryParam;
 
@@ -103,6 +103,13 @@ after 'prepare_headers' => sub {
 __PACKAGE__->log->disable('debug')    #
   unless __PACKAGE__->debug;
 
+# Check upload_dir
+my $cache_dir = path(FixMyStreet->config('UPLOAD_DIR'))->absolute(FixMyStreet->path_to());
+$cache_dir->mkpath;
+unless ( -d $cache_dir && -w $cache_dir ) {
+    warn "\x1b[31mCan't find/write to photo cache directory '$cache_dir'\x1b[0m\n";
+}
+
 =head1 NAME
 
 FixMyStreet::App - Catalyst based application
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 04521b5ce..8fcc1700e 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -67,14 +67,7 @@ has upload_dir => (
     is => 'ro',
     lazy => 1,
     default => sub {
-        my $self = shift;
-        my $cache_dir = path(FixMyStreet->config('UPLOAD_DIR'))->absolute(FixMyStreet->path_to());
-        $cache_dir->mkpath;
-        unless ( -d $cache_dir && -w $cache_dir ) {
-            warn "Can't find/write to photo cache directory '$cache_dir'";
-            return;
-        }
-        $cache_dir;
+        path(FixMyStreet->config('UPLOAD_DIR'))->absolute(FixMyStreet->path_to());
     },
 );
 
-- 
cgit v1.2.3


From 4afd0026262dd74425d40ac78649db3d8148c883 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 16 Mar 2017 12:48:52 +0000
Subject: [fixmystreet.com] Remove friendly A/B test.

This has been running for a year, added in e17eb20.
---
 perllib/FixMyStreet/Cobrand/FixMyStreet.pm         |  21 ----
 t/app/controller/report_import.t                   |   3 -
 t/app/controller/report_new.t                      |   2 -
 t/app/controller/report_new_open311.t              |   1 -
 .../web/fixmystreet.com/around/_report_banner.html |  10 --
 templates/web/fixmystreet.com/around/intro.html    |   9 --
 templates/web/fixmystreet.com/header_extra.html    |  18 ---
 .../web/fixmystreet.com/report/new/extra_name.html |  42 -------
 web/cobrands/fixmystreet.com/base.scss             |  54 ---------
 .../images/friendly-homepage-mobile.jpg            | Bin 51838 -> 0 bytes
 .../fixmystreet.com/images/friendly-homepage.jpg   | Bin 73357 -> 0 bytes
 .../fixmystreet.com/images/friendly-logo-home.png  | Bin 8531 -> 0 bytes
 .../images/friendly-logo-home@2.png                | Bin 20472 -> 0 bytes
 .../images/friendly-logo-mobile.png                | Bin 4826 -> 0 bytes
 .../images/friendly-logo-mobile@2.png              | Bin 11598 -> 0 bytes
 .../fixmystreet.com/images/friendly-mysoc-logo.png | Bin 1543 -> 0 bytes
 .../images/friendly-mysoc-logo@2.png               | Bin 3031 -> 0 bytes
 web/cobrands/fixmystreet.com/layout.scss           | 124 ---------------------
 web/cobrands/fixmystreet/fixmystreet.js            |   4 -
 19 files changed, 288 deletions(-)
 delete mode 100755 templates/web/fixmystreet.com/around/_report_banner.html
 delete mode 100644 templates/web/fixmystreet.com/around/intro.html
 delete mode 100644 templates/web/fixmystreet.com/report/new/extra_name.html
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-homepage.jpg
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-logo-home.png
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png
 delete mode 100644 web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 1fb822893..1052bac0e 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -60,26 +60,5 @@ sub extra_contact_validation {
     return %errors;
 }
 
-sub report_form_extras {
-    ( { name => 'gender', required => 0 }, { name => 'variant', required => 0 } )
-}
-
-sub ask_gender_question {
-    my $self = shift;
-
-    return 1 unless $self->{c}->user;
-
-    my $reports = $self->{c}->model('DB::Problem')->search({
-        user_id => $self->{c}->user->id,
-        extra => { like => '%gender%' }
-    }, { order_by => { -desc => 'id' } });
-
-    while (my $report = $reports->next) {
-        my $gender = $report->get_extra_metadata('gender');
-        return 0 if $gender =~ /female|male|other|unknown/;
-    }
-    return 1;
-}
-
 1;
 
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index c8cbcf412..6c0da221c 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -156,7 +156,6 @@ subtest "Submit a correct entry" => sub {
         phone         => '',
         may_show_name => '1',
         category      => '-- Pick a category --',
-        gender => undef,
       },
       "check imported fields are shown";
 
@@ -193,7 +192,6 @@ subtest "Submit a correct entry" => sub {
         phone         => '',
         may_show_name => '1',
         category      => '-- Pick a category --',
-        gender => undef,
       },
       "check imported fields are shown";
 
@@ -281,7 +279,6 @@ subtest "Submit a correct entry (with location)" => sub {
         phone         => '',
         may_show_name => '1',
         category      => '-- Pick a category --',
-        gender => undef,
       },
       "check imported fields are shown";
 
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 6b4f40172..c4dd30e47 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -498,7 +498,6 @@ foreach my $test (
         my $new_values = {
             %{ $test->{fields} },     # values added to form
             %{ $test->{changes} },    # changes we expect
-            gender => undef,
         };
         is_deeply $mech->visible_form_values, $new_values,
           "values correctly changed";
@@ -836,7 +835,6 @@ foreach my $test (
                     photo2        => '',
                     photo3        => '',
                     category      => '-- Pick a category --',
-                    gender => undef,
                 },
                 "user's details prefilled"
             );
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index db6e07933..a5b742783 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -139,7 +139,6 @@ foreach my $test (
         my $new_values = {
             %{ $test->{fields} },     # values added to form
             %{ $test->{changes} },    # changes we expect
-            gender => undef,
         };
         is_deeply $mech->visible_form_values, $new_values,
           "values correctly changed";
diff --git a/templates/web/fixmystreet.com/around/_report_banner.html b/templates/web/fixmystreet.com/around/_report_banner.html
deleted file mode 100755
index fb2134020..000000000
--- a/templates/web/fixmystreet.com/around/_report_banner.html
+++ /dev/null
@@ -1,10 +0,0 @@
-[%# Same as parent, with variant green banner text %]
-<h1 class="big-green-banner variant1">
-    Click map to request a fix
-</h1>
-<h1 class="big-green-banner variant0">
-    [% loc( 'Click map to report a problem' ) %]
-</h1>
-<a id="skip-this-step" href="[% url_skip %]" rel="nofollow">
-    [% loc("Can't see the map? <em>Skip this step</em>") %]
-</a>
diff --git a/templates/web/fixmystreet.com/around/intro.html b/templates/web/fixmystreet.com/around/intro.html
deleted file mode 100644
index 5b756cd31..000000000
--- a/templates/web/fixmystreet.com/around/intro.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[%# Same as parent, with variant heading text %]
-<div class="variant1">
-    <h1>Get things fixed in your local community</h1>
-    <h2>(like blocked pavements, parks and playgrounds in need of maintenance)</h2>
-</div>
-<div class="variant0">
-    <h1>[% loc('Report, view, or discuss local problems') %]</h1>
-    <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
-</div>
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html
index 4ea87a5e1..dc0f86693 100644
--- a/templates/web/fixmystreet.com/header_extra.html
+++ b/templates/web/fixmystreet.com/header_extra.html
@@ -16,22 +16,4 @@
 })(document);
 </script>
 
-[%# We are conducting an A/B experiment %]
-[% IF c.config.BASE_URL == "https://www.fixmystreet.com" AND not admin AND NOT c.req.header('User-Agent').match('Google Page Speed') %]
-<script src="//www.google-analytics.com/cx/api.js?experiment=ZwMlZkAhSbK_tP_QG64QrQ"></script>
-<script nonce="[% csp_nonce %]">
-var variation = typeof cxApi !== "undefined" ? cxApi.chooseVariation() : 0,
-    docElement = document.documentElement,
-    className = docElement.className;
-if (!/about\/council/.test(location.pathname)) {
-    docElement.className = className + ' variant' + variation;
-}
-</script>
-[% END %]
-<style>
-html .variant1 { display: none !important; }
-html.variant1 .variant0 { display: none !important; }
-html.variant1 .variant1 { display: block !important; }
-</style>
-
 [% INCLUDE 'tracking_code.html' %]
diff --git a/templates/web/fixmystreet.com/report/new/extra_name.html b/templates/web/fixmystreet.com/report/new/extra_name.html
deleted file mode 100644
index dbd971d74..000000000
--- a/templates/web/fixmystreet.com/report/new/extra_name.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[%# Same as parent, with added gender question %]
-
-[% IF (page == 'around' OR page == 'new') AND c.cobrand.ask_gender_question %]
-<p>
-We’re conducting research to make sure our site is good for everyone;
-please help us out by providing your gender. <em>This will not be
-shared with the council or displayed publicly.</em>
-</p>
-
-[% SET gender = report.get_extra_metadata('gender') %]
-<p class="segmented-control segmented-control--radio" style="font-size: 80%">
-    <input type="radio" name="gender" id="gender_female" value="female"[% ' checked' IF gender == 'female' %]>
-    <label class="btn" for="gender_female">Female</label>
-    <input type="radio" name="gender" id="gender_male" value="male"[% ' checked' IF gender == 'male' %]>
-    <label class="btn" for="gender_male">Male</label>
-    <input type="radio" name="gender" id="gender_other" value="other"[% ' checked' IF gender == 'other' %]>
-    <label class="btn" for="gender_other">Other</label>
-    <input type="radio" name="gender" id="gender_unknown" value="unknown"[% ' checked' IF gender == 'unknown' %]>
-    <label class="btn" for="gender_unknown">Prefer not to say</label>
-</p>
-[% END %]
-
-<input type="hidden" name="variant" value="0">
-
-[% IF extra_name_info %]
-<label for="form_fms_extra_title">Title</label>
-[% IF field_errors.fms_extra_title %]
-    <p class='form-error'>[% field_errors.fms_extra_title %]</p>
-[% END %]
-[% title = '' %]
-[% IF fms_extra_title %][% title = fms_extra_title | upper %]
-[% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %]
-<select class="form-control form-focus-trigger required js-form-name" id="form_fms_extra_title"
-    name="fms_extra_title">
-    <option></option>
-    <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option>
-    <option value="MISS"[% ' selected' IF title == 'MISS' %]>Miss</option>
-    <option value="MRS"[% ' selected' IF title == 'MRS' %]>Mrs</option>
-    <option value="MS"[% ' selected' IF title == 'MS' %]>Ms</option>
-    <option value="DR"[% ' selected' IF title == 'DR' %]>Dr</option>
-</select>
-[% END %]
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index d0a152627..292446e92 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -132,60 +132,6 @@
     );
 }
 
-.variant1 {
-    #site-header {
-        border-top-color: #fff;
-        background: #fad52a;
-    }
-
-    #report-cta {
-        border: none;
-        background-color: #fff;
-        color: mix(#fad52a, #000, 50%);
-        padding: 0.5em 0.5em 0.4em 0.5em;
-    }
-
-    #site-logo {
-        background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile.png);
-
-        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-            background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png);
-            background-size: 175px 40px;
-        }
-    }
-
-    &.frontpage {
-        background: #fad52a url(/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg) top center no-repeat;
-        background-size: 100%;
-
-        #site-header {
-            border-top-color: #fff;
-            background: transparent;
-        }
-    }
-
-    #front-main #postcodeForm {
-        background: rgba(255,255,255,0.3);
-
-        input#sub {
-            @include linear-gradient(#49c0ff, #1091d5);
-
-            &:hover, &:focus {
-                @include linear-gradient(darken(#49c0ff, 10%), darken(#1091d5, 10%));
-            }
-        }
-    }
-
-    #front-main a#geolocate_link {
-        background: transparent;
-        color: inherit;
-    }
-
-    #front-main + .container {
-        background: transparent;
-    }
-}
-
 // Avoid double border between mobile nav and footer
 .nav-menu--main > :last-child a {
   border-bottom: none;
diff --git a/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg b/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg
deleted file mode 100644
index d0560617c..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-homepage-mobile.jpg and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg b/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg
deleted file mode 100644
index 9a3a82108..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-homepage.jpg and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-home.png b/web/cobrands/fixmystreet.com/images/friendly-logo-home.png
deleted file mode 100644
index a80039895..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-logo-home.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png b/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png
deleted file mode 100644
index 2e4ae4cf7..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-logo-home@2.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png b/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png
deleted file mode 100644
index ad16a2543..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png b/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png
deleted file mode 100644
index 3e0eb6423..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png b/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png
deleted file mode 100644
index 8f5ceec9a..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png b/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png
deleted file mode 100644
index 487b14ebe..000000000
Binary files a/web/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png and /dev/null differ
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index f8026171d..8318eab90 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -315,127 +315,3 @@ body.unresponsive-council {
 body.mappage .mysoc-footer {
     display: none;
 }
-
-.variant1 {
-    body {
-        background: #fad52a url(/cobrands/fixmystreet.com/images/friendly-homepage.jpg) top center no-repeat;
-        background-size: 100%;
-    }
-
-    #site-logo {
-        background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile.png);
-
-        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-            background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-mobile@2.png);
-            background-size: 175px 40px;
-        }
-    }
-
-    body.frontpage {
-        background-image: url(/cobrands/fixmystreet.com/images/friendly-homepage.jpg);
-
-        #site-logo {
-            background: transparent url(/cobrands/fixmystreet.com/images/friendly-logo-home.png) 0 0 no-repeat;
-
-            @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-                background-image: url(/cobrands/fixmystreet.com/images/friendly-logo-home@2.png);
-                background-size: 300px 60px;
-            }
-        }
-    }
-
-    #front-main {
-        background: rgba(255, 255, 255, 0.3);
-        margin-top: 1em;
-
-        #postcodeForm {
-            background: transparent;
-
-            label {
-                margin: 1em 0;
-            }
-        }
-
-        a#geolocate_link {
-            height: auto;
-            padding: 0.5em 0 0.5em 1.5em;
-            margin-top: 0.5em;
-            font-weight: bold;
-            font-size: 1em;
-            background-size: 16px;
-            background-position: 0% 50%;
-        }
-    }
-
-    body.twothirdswidthpage #front-main,
-    body.fullwidthpage #front-main {
-        padding: 3em 2em 6em 2em;
-    }
-
-    #site-header {
-        background: transparent;
-    }
-
-    .nav-menu a,
-    .nav-menu span {
-        color: #222;
-    }
-
-    .nav-menu--main {
-        font-weight: bold;
-        span {
-            color: inherit;
-        }
-
-        a {
-            &:hover,
-            &:focus {
-                background: rgba(255, 255, 255, 0.2);
-            }
-        }
-
-        a.report-a-problem-btn {
-            background-color: #fff;
-            color: mix(#fad52a, #000, 50%);
-            padding: 0.25em 0.5em;
-        }
-    }
-
-    .nav-wrapper .nav-wrapper-2 {
-        border-top-color: #fff;
-        border-image: none;
-    }
-
-    body.mappage .nav-wrapper .nav-wrapper-2 {
-        background: darken(#fad52a, 5%);
-    }
-
-    body.twothirdswidthpage .container .content footer .tablewrapper {
-        color: #222;
-        background: #fad52a;
-    }
-    body.fullwidthpage .container .content footer .tablewrapper {
-        color: #222;
-        background: transparent;
-    }
-
-    .nav-menu--mysoc {
-        background: #fff;
-    }
-
-    #footer-help a {
-        color: inherit;
-        text-decoration: underline;
-    }
-
-    #mysoc-logo {
-        background-image: url(/cobrands/fixmystreet.com/images/friendly-mysoc-logo.png);
-        background-position: 50% 0%;
-        background-size: 90px auto;
-
-        @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
-            background-image: url(/cobrands/fixmystreet.com/images/friendly-mysoc-logo@2.png);
-            background-size: 90px auto;
-        }
-    }
-}
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index db61bd008..c09eeb803 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -1120,10 +1120,6 @@ $(function() {
         'page': fixmystreet.page
     };
 
-    if (typeof variation !== 'undefined' && variation === 1) {
-        $('input[name=variant]').val(1);
-    }
-
     $.each(fixmystreet.set_up, function(setup_name, setup_func) {
         setup_func();
     });
-- 
cgit v1.2.3


From a4d015e48ae374102bd9b19f9633dda3f6b9ccdd Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 16 Mar 2017 16:04:08 +0000
Subject: Fix invisible segmented controls in old Webkit.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I can't put it better than
https://roland.codes/blog/legacy-flexbox-invisible-float-bug/ :

"Webkit’s implementation of legacy Flexbox has an strange bug that makes
flex items become invisible when they’re floated. What makes it strange
is that the flex items will still take up space in the DOM, as if they
have visibility: hidden applied.

Usually you wouldn’t use float on flex items (the spec even says that
float has no effect on them). But it’s useful for providing a fallback
layout when Flexbox isn’t supported.

Luckily I chanced on a hack that fixes the bug. All you have to do is
give the floated flex items a position, like position: relative, and
they’ll (strangely) become visible again. Another option is to use
Modernizr to only apply the float when Flexbox isn’t supported.

This bug affects legacy Flexbox in all Webkit browsers. Which includes
Chrome 20-, Safari 6-, iOS 6.1- and Android 4.3-."
---
 web/cobrands/sass/_base.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 366939d4c..33242f5af 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2173,6 +2173,7 @@ table.nicetable {
     text-align: center;
     border-right-width: 0; // avoid double border between items
     float: left; // float fallback for browsers that don't support flexbox
+    position: relative; // Make sure this is shown on legacy flexbox webkit
     @include flex(1 0 auto, 1);
   }
 
-- 
cgit v1.2.3


From 755414d0169e49951bdbdb51ae2e82fe82807c24 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 17 Mar 2017 14:37:20 +0000
Subject: Remove superfluous lists from Open311 JSON output.

The Open311 JSON output was wrapping each request parameter in a list.
This was presumably to prevent the XML output including the parameters
as attributes rather than children. A better way to fix this is to use
the NoAttr parameter to XMLout which forces them to be children.
---
 perllib/FixMyStreet/App/Controller/Open311.pm | 61 ++++++++++++---------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 98e5f42b2..bc08593de 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -233,44 +233,42 @@ sub output_requests : Private {
 
         my $request =
         {
-            'service_request_id' => [ $id ],
-            'title' => [ $problem->title ], # Not in Open311 v2
-            'detail'  => [ $problem->detail ], # Not in Open311 v2
-            'description' => [ $problem->title .': ' . $problem->detail ],
-            'lat' => [ $problem->latitude ],
-            'long' => [ $problem->longitude ],
-            'status' => [ $problem->state ],
-#            'status_notes' => [ {} ],
-            'requested_datetime' => [ w3date($problem->confirmed) ],
-            'updated_datetime' => [ w3date($problem->lastupdate) ],
-#            'expected_datetime' => [ {} ],
-#            'address' => [ {} ],
-#            'address_id' => [ {} ],
-            'service_code' => [ $problem->category ],
-            'service_name' => [ $problem->category ],
-#            'service_notice' => [ {} ],
-#            'zipcode' => [ {} ],
-            'interface_used' => [ $problem->service ], # Not in Open311 v2
+            'service_request_id' => $id,
+            'title' => $problem->title, # Not in Open311 v2
+            'detail'  => $problem->detail, # Not in Open311 v2
+            'description' => $problem->title .': ' . $problem->detail,
+            'lat' => $problem->latitude,
+            'long' => $problem->longitude,
+            'status' => $problem->state,
+#            'status_notes' => {},
+            'requested_datetime' => w3date($problem->confirmed),
+            'updated_datetime' => w3date($problem->lastupdate),
+#            'expected_datetime' => {},
+#            'address' => {},
+#            'address_id' => {},
+            'service_code' => $problem->category,
+            'service_name' => $problem->category,
+#            'service_notice' => {},
+#            'zipcode' => {},
+            'interface_used' => $problem->service, # Not in Open311 v2
         };
 
         if ( $c->cobrand->moniker eq 'zurich' ) {
-            $request->{service_notice} = [ 
-                $problem->get_extra_metadata('public_response')
-            ];
+            $request->{service_notice} = $problem->get_extra_metadata('public_response');
         }
         else {
             # FIXME Not according to Open311 v2
-            $request->{agency_responsible} = $problem->bodies;
+            my @body_names = map { $_->name } values %{$problem->bodies};
+            $request->{agency_responsible} = {'recipient' => [ @body_names ] };
         }
 
         if ( !$problem->anonymous ) {
             # Not in Open311 v2
-            $request->{'requestor_name'} = [ $problem->name ];
+            $request->{'requestor_name'} = $problem->name;
         }
         if ( $problem->whensent ) {
             # Not in Open311 v2
-            $request->{'agency_sent_datetime'} =
-                [ w3date($problem->whensent) ];
+            $request->{'agency_sent_datetime'} = w3date($problem->whensent);
         }
 
         # Extract number of updates
@@ -279,25 +277,18 @@ sub output_requests : Private {
         )->count;
         if ($updates) {
             # Not in Open311 v2
-            $request->{'comment_count'} = [ $updates ];
+            $request->{'comment_count'} = $updates;
         }
 
         my $display_photos = $c->cobrand->allow_photo_display($problem);
         if ($display_photos && $problem->photo) {
             my $url = $c->cobrand->base_url();
             my $imgurl = $url . $problem->photos->[0]->{url_full};
-            $request->{'media_url'} = [ $imgurl ];
+            $request->{'media_url'} = $imgurl;
         }
         push(@problemlist, $request);
     }
 
-    foreach my $request (@problemlist) {
-        if ($request->{agency_responsible}) {
-            my @body_names = map { $_->name } values %{$request->{agency_responsible}} ;
-            $request->{agency_responsible} =
-                [ {'recipient' => [ @body_names ] } ];
-        }
-    }
     $c->forward( 'format_output', [ {
         'requests' => [ {
             'request' => \@problemlist
@@ -432,7 +423,7 @@ sub format_output : Private {
         $c->res->body( encode_json($hashref) );
     } elsif ('xml' eq $format) {
         $c->res->content_type('application/xml; charset=utf-8');
-        $c->res->body( XMLout($hashref, RootName => undef) );
+        $c->res->body( XMLout($hashref, RootName => undef, NoAttr => 1 ) );
     } else {
         $c->detach( 'error', [
             sprintf(_('Invalid format %s specified.'), $format)
-- 
cgit v1.2.3


From 5370647bfa52503948148753bad7bca5c463d79c Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Fri, 17 Mar 2017 16:36:24 +0000
Subject: Show loading indicator when loading pins

---
 templates/web/base/maps/openlayers.html |  4 +++-
 web/cobrands/sass/_base.scss            | 18 ++++++++++++++++++
 web/i/loading.svg                       |  1 +
 web/js/map-OpenLayers.js                | 17 ++++++-----------
 4 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 web/i/loading.svg

diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 18829c5c4..215b69d26 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -33,4 +33,6 @@
     [% IF map.copyright %]
     <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div>
     [% END %]
-
+    <div id="loading-indicator" class="hidden" aria-hidden="true">
+        <img src="/i/loading.svg" alt="Loading..." />
+    </div>
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 33242f5af..25674aedd 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1585,6 +1585,24 @@ html.js #map .noscript {
   }
 }
 
+// Loading indicator
+
+#loading-indicator {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+  opacity: 0.4;
+  text-align: center;
+
+  img {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
+}
+
 .big-green-banner {
   position: relative;
   top: -1.75em;
diff --git a/web/i/loading.svg b/web/i/loading.svg
new file mode 100644
index 000000000..0b68e8bc0
--- /dev/null
+++ b/web/i/loading.svg
@@ -0,0 +1 @@
+<svg width='94px' height='94px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-default"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(0 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(30 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.08333333333333333s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(60 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.16666666666666666s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(90 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.25s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(120 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.3333333333333333s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(150 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.4166666666666667s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(180 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.5s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(210 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.5833333333333334s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(240 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.6666666666666666s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(270 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.75s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(300 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.8333333333333334s' repeatCount='indefinite'/></rect><rect  x='46.5' y='40' width='7' height='20' rx='5' ry='5' fill='#cccccc' transform='rotate(330 50 50) translate(0 -30)'>  <animate attributeName='opacity' from='1' to='0' dur='1s' begin='0.9166666666666666s' repeatCount='indefinite'/></rect></svg>
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 49801911b..2a5af940d 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -801,6 +801,9 @@ OpenLayers.Strategy.FixMyStreetFixed = OpenLayers.Class(OpenLayers.Strategy.Fixe
 // params to /ajax if the user has filtered the map.
 OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
     read: function(options) {
+        // Show the loading indicator over the map
+        $('#loading-indicator').removeClass('hidden');
+        $('#loading-indicator').attr('aria-hidden', false);
         // Pass the values of the category, status, and sort fields as query params
         $.each({ filter_category: 'filter_categories', status: 'statuses', sort: 'sort' }, function(key, id) {
             var val = $('#' + id).val();
@@ -817,17 +820,9 @@ OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
 /* Pan data handler */
 OpenLayers.Format.FixMyStreet = OpenLayers.Class(OpenLayers.Format.JSON, {
     read: function(json, filter) {
-        // Check we haven't received the data after the map has been clicked.
-        if (fixmystreet.page == 'new') {
-            // If we have, we want to do nothing, which means returning an
-            // array of the back-projected version of the current pin
-            var pin = fixmystreet.markers.features[0].clone();
-            pin.geometry.transform(
-                fixmystreet.map.getProjectionObject(),
-                new OpenLayers.Projection("EPSG:4326")
-            );
-            return [ pin ];
-        }
+        // Remove loading indicator
+        $('#loading-indicator').addClass('hidden');
+        $('#loading-indicator').attr('aria-hidden', true);
         if (typeof json == 'string') {
             obj = OpenLayers.Format.JSON.prototype.read.apply(this, [json, filter]);
         } else {
-- 
cgit v1.2.3


From 6fb4eca34fd47612216f642985cac74359727b15 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 17 Mar 2017 16:49:55 +0000
Subject: [fixmystreet.com] Fix WestBerkshire cobrand.

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

diff --git a/perllib/FixMyStreet/Cobrand/WestBerkshire.pm b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
index 1ffdf0286..7e98187bb 100644
--- a/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
+++ b/perllib/FixMyStreet/Cobrand/WestBerkshire.pm
@@ -1,5 +1,5 @@
 package FixMyStreet::Cobrand::WestBerkshire;
-use base 'FixMyStreet::Cobrand::UKCouncils';
+use base 'FixMyStreet::Cobrand::UK';
 
 use strict;
 use warnings;
-- 
cgit v1.2.3


From 02fcb1606bc2b739fdc798e5ca06f2ed1b6bf6ea Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 17 Mar 2017 22:25:08 +0000
Subject: Fix warning, use correct user object in delete log

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

diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 27f4393bb..1c2e98bd4 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -275,7 +275,7 @@ sub delete :Local :Args(1) {
     $p->user->update_reputation(-1);
 
     $c->model('DB::AdminLog')->create( {
-        user => $c->user,
+        user => $c->user->obj,
         admin_user => $c->user->from_body->name,
         object_type => 'problem',
         action => 'state_change',
-- 
cgit v1.2.3


From 3f21a9742d89c3e4fda47a0be6ec2a17f802c99a Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 13 Feb 2017 15:13:12 +0000
Subject: Add customisable defect types.

Problems can have an associated defect type, that can be assigned during
an inspection. Include an admin interface for managing these types, that
can also be assigned on a per-category basis, currently available to the
Oxfordshire cobrand.

(Also include 'TM' in traffic management Exor RDI output.)
---
 bin/update-schema                                  |   1 +
 db/schema.sql                                      |  18 ++++
 db/schema_0050-add-defect-type-table.sql           |  21 ++++
 .../App/Controller/Admin/DefectTypes.pm            | 113 +++++++++++++++++++++
 .../App/Controller/Admin/ExorDefects.pm            |  16 ++-
 perllib/FixMyStreet/App/Controller/Report.pm       |   8 +-
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |  22 +++-
 perllib/FixMyStreet/DB/Result/Body.pm              |  10 +-
 perllib/FixMyStreet/DB/Result/Contact.pm           |  11 +-
 perllib/FixMyStreet/DB/Result/ContactDefectType.pm |  46 +++++++++
 perllib/FixMyStreet/DB/Result/DefectType.pm        |  66 ++++++++++++
 perllib/FixMyStreet/DB/Result/Problem.pm           |  29 +++++-
 perllib/FixMyStreet/DB/ResultSet/DefectType.pm     |  22 ++++
 perllib/FixMyStreet/TestMech.pm                    |   9 ++
 t/app/model/defecttype.t                           |  67 ++++++++++++
 templates/web/base/admin/category-multiselect.html |  10 ++
 templates/web/base/admin/defecttypes/edit.html     |  37 +++++++
 templates/web/base/admin/defecttypes/index.html    |  13 +++
 templates/web/base/admin/defecttypes/list.html     |  35 +++++++
 templates/web/base/defect_type/format.html         |   9 ++
 templates/web/base/report/_inspect.html            |  23 ++---
 .../admin/defecttypes/extra_fields.html            |   8 ++
 templates/web/oxfordshire/defect_type/format.html  |   4 +
 web/cobrands/fixmystreet/admin.js                  |   2 +
 web/cobrands/fixmystreet/fixmystreet.js            |  33 +++---
 25 files changed, 593 insertions(+), 40 deletions(-)
 create mode 100644 db/schema_0050-add-defect-type-table.sql
 create mode 100644 perllib/FixMyStreet/App/Controller/Admin/DefectTypes.pm
 create mode 100644 perllib/FixMyStreet/DB/Result/ContactDefectType.pm
 create mode 100644 perllib/FixMyStreet/DB/Result/DefectType.pm
 create mode 100644 perllib/FixMyStreet/DB/ResultSet/DefectType.pm
 create mode 100644 t/app/model/defecttype.t
 create mode 100644 templates/web/base/admin/category-multiselect.html
 create mode 100644 templates/web/base/admin/defecttypes/edit.html
 create mode 100644 templates/web/base/admin/defecttypes/index.html
 create mode 100644 templates/web/base/admin/defecttypes/list.html
 create mode 100644 templates/web/base/defect_type/format.html
 create mode 100644 templates/web/oxfordshire/admin/defecttypes/extra_fields.html
 create mode 100644 templates/web/oxfordshire/defect_type/format.html

diff --git a/bin/update-schema b/bin/update-schema
index 94c42d8ae..171b87576 100755
--- a/bin/update-schema
+++ b/bin/update-schema
@@ -194,6 +194,7 @@ else {
 # By querying the database schema, we can see where we're currently at
 # (assuming schema change files are never half-applied, which should be the case)
 sub get_db_version {
+    return '0050' if table_exists('defect_types');
     return '0049' if column_exists('response_priorities', 'external_id');
     return '0048' if column_exists('response_templates', 'state');
     return '0047' if column_exists('response_priorities', 'description');
diff --git a/db/schema.sql b/db/schema.sql
index 23db82b65..18c1533d9 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -502,3 +502,21 @@ CREATE TABLE contact_response_priorities (
     contact_id int REFERENCES contacts(id) NOT NULL,
     response_priority_id int REFERENCES response_priorities(id) NOT NULL
 );
+
+CREATE TABLE defect_types (
+    id serial not null primary key,
+    body_id int references body(id) not null,
+    name text not null,
+    description text not null,
+    extra text,
+    unique(body_id, name)
+);
+
+CREATE TABLE contact_defect_types (
+    id serial NOT NULL PRIMARY KEY,
+    contact_id int REFERENCES contacts(id) NOT NULL,
+    defect_type_id int REFERENCES defect_types(id) NOT NULL
+);
+
+ALTER TABLE problem
+    ADD COLUMN defect_type_id int REFERENCES defect_types(id);
diff --git a/db/schema_0050-add-defect-type-table.sql b/db/schema_0050-add-defect-type-table.sql
new file mode 100644
index 000000000..d65e17940
--- /dev/null
+++ b/db/schema_0050-add-defect-type-table.sql
@@ -0,0 +1,21 @@
+BEGIN;
+
+CREATE TABLE defect_types (
+    id serial not null primary key,
+    body_id int references body(id) not null,
+    name text not null,
+    description text not null,
+    extra text,
+    unique(body_id, name)
+);
+
+CREATE TABLE contact_defect_types (
+    id serial NOT NULL PRIMARY KEY,
+    contact_id int REFERENCES contacts(id) NOT NULL,
+    defect_type_id int REFERENCES defect_types(id) NOT NULL
+);
+
+ALTER TABLE problem
+    ADD COLUMN defect_type_id int REFERENCES defect_types(id);
+
+COMMIT;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/DefectTypes.pm b/perllib/FixMyStreet/App/Controller/Admin/DefectTypes.pm
new file mode 100644
index 000000000..bcfeb3dd8
--- /dev/null
+++ b/perllib/FixMyStreet/App/Controller/Admin/DefectTypes.pm
@@ -0,0 +1,113 @@
+package FixMyStreet::App::Controller::Admin::DefectTypes;
+use Moose;
+use namespace::autoclean;
+use mySociety::ArrayUtils;
+
+BEGIN { extends 'Catalyst::Controller'; }
+
+
+sub begin : Private {
+    my ( $self, $c ) = @_;
+
+    $c->forward('/admin/begin');
+}
+
+sub index : Path : Args(0) {
+    my ( $self, $c ) = @_;
+
+    my $user = $c->user;
+
+    if ($user->is_superuser) {
+        $c->forward('/admin/fetch_all_bodies');
+    } elsif ( $user->from_body ) {
+        $c->forward('load_user_body', [ $user->from_body->id ]);
+        $c->res->redirect( $c->uri_for( '', $c->stash->{body}->id ) );
+    } else {
+        $c->detach( '/page_error_404_not_found' );
+    }
+}
+
+sub list : Path : Args(1) {
+    my ($self, $c, $body_id) = @_;
+
+    $c->forward('load_user_body', [ $body_id ]);
+
+    my @defect_types = $c->stash->{body}->defect_types->search(
+        undef,
+        {
+            order_by => 'name'
+        }
+    );
+
+    $c->stash->{defect_types} = \@defect_types;
+}
+
+sub edit : Path : Args(2) {
+    my ( $self, $c, $body_id, $defect_type_id ) = @_;
+
+    $c->forward('load_user_body', [ $body_id ]);
+
+    my $defect_type;
+    if ($defect_type_id eq 'new') {
+        $defect_type = $c->stash->{body}->defect_types->new({});
+    }
+    else {
+        $defect_type = $c->stash->{body}->defect_types->find( $defect_type_id )
+            or $c->detach( '/page_error_404_not_found' );
+    }
+
+    $c->forward('/admin/fetch_contacts');
+    my @contacts = $defect_type->contacts->all;
+    my @live_contacts = $c->stash->{live_contacts}->all;
+    my %active_contacts = map { $_->id => 1 } @contacts;
+    my @all_contacts = map { {
+        id => $_->id,
+        category => $_->category,
+        active => $active_contacts{$_->id},
+    } } @live_contacts;
+    $c->stash->{contacts} = \@all_contacts;
+
+    if ($c->req->method eq 'POST') {
+        $defect_type->name( $c->get_param('name') );
+        $defect_type->description( $c->get_param('description') );
+
+        my @extra_fields = @{ $c->cobrand->call_hook('defect_type_extra_fields') || [] };
+        foreach ( @extra_fields ) {
+            $defect_type->set_extra_metadata( $_ => $c->get_param("extra[$_]") );
+        }
+
+        $defect_type->update_or_insert;
+        my @live_contact_ids = map { $_->id } @live_contacts;
+        my @new_contact_ids = $c->get_param_list('categories');
+        @new_contact_ids = @{ mySociety::ArrayUtils::intersection(\@live_contact_ids, \@new_contact_ids) };
+        $defect_type->contact_defect_types->search({
+            contact_id => { '!=' => \@new_contact_ids },
+        })->delete;
+        foreach my $contact_id (@new_contact_ids) {
+            $defect_type->contact_defect_types->find_or_create({
+                contact_id => $contact_id,
+            });
+        }
+
+        $c->res->redirect( $c->uri_for( '', $c->stash->{body}->id ) );
+    }
+
+    $c->stash->{defect_type} = $defect_type;
+}
+
+sub load_user_body : Private {
+    my ($self, $c, $body_id) = @_;
+
+    my $has_permission = $c->user->has_body_permission_to('defect_type_edit', $body_id);
+
+    unless ( $has_permission ) {
+        $c->detach( '/page_error_404_not_found' );
+    }
+
+    $c->stash->{body} = $c->model('DB::Body')->find($body_id)
+        or $c->detach( '/page_error_404_not_found' );
+}
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
index 013d710af..201742c81 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm
@@ -141,22 +141,32 @@ sub download : Path('download') : Args(0) {
         foreach my $report (@$inspections) {
             my ($eastings, $northings) = $report->local_coords;
             my $description = sprintf("%s %s", $report->external_id || "", $report->get_extra_metadata('detailed_information') || "");
+            my $activity_code = $report->defect_type ?
+                $report->defect_type->get_extra_metadata('activity_code')
+                : 'MC';
+            my $traffic_information = $report->get_extra_metadata('traffic_information') ?
+                'TM ' . $report->get_extra_metadata('traffic_information')
+                : 'TM none';
+
             $csv->combine(
                 "I", # beginning of defect record
-                "MC", # activity code - minor carriageway, also FC (footway)
+                $activity_code, # activity code - minor carriageway, also FC (footway)
                 "", # empty field, can also be A (seen on MC) or B (seen on FC)
                 sprintf("%03d", ++$i), # randomised sequence number
                 "${eastings}E ${northings}N", # defect location field, which we don't capture from inspectors
                 $report->inspection_log_entry->whenedited->strftime("%H%M"), # defect time raised
                 "","","","","","","", # empty fields
-                $report->get_extra_metadata('traffic_information') ? 'TM required' : 'TM none', # further description
+                $traffic_information,
                 $description, # defect description
             );
             push @body, $csv->string;
 
+            my $defect_type = $report->defect_type ?
+                              $report->defect_type->get_extra_metadata('defect_code')
+                              : 'SFP2';
             $csv->combine(
                 "J", # georeferencing record
-                $report->get_extra_metadata('defect_type') || 'SFP2', # defect type - SFP2: sweep and fill <1m2, POT2 also seen
+                $defect_type, # defect type - SFP2: sweep and fill <1m2, POT2 also seen
                 $report->response_priority ?
                     $report->response_priority->external_id :
                     "2", # priority of defect
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 27f4393bb..12280db47 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -340,10 +340,16 @@ sub inspect : Private {
         my %update_params = ();
 
         if ($permissions->{report_inspect}) {
-            foreach (qw/detailed_information traffic_information duplicate_of defect_type/) {
+            foreach (qw/detailed_information traffic_information duplicate_of/) {
                 $problem->set_extra_metadata( $_ => $c->get_param($_) );
             }
 
+            if ( $c->get_param('defect_type') ) {
+                $problem->defect_type($problem->defect_types->find($c->get_param('defect_type')));
+            } else {
+                $problem->defect_type(undef);
+            }
+
             if ( $c->get_param('include_update') ) {
                 $update_text = Utils::cleanup_text( $c->get_param('public_update'), { allow_multiline => 1 } );
                 if (!$update_text) {
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index d585a5328..78247e39d 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -161,9 +161,13 @@ sub admin_pages {
 
     # Oxfordshire have a custom admin page for downloading reports in an Exor-
     # friendly format which anyone with report_instruct permission can use.
-    if ( $user->is_superuser || $user->has_body_permission_to('report_instruct') ) {
+    if ( $user->has_body_permission_to('report_instruct') ) {
         $pages->{exordefects} = [ _('Download Exor RDI'), 10 ];
     }
+    if ( $user->has_body_permission_to('defect_type_edit') ) {
+        $pages->{defecttypes} = [ _('Defect Types'), 11 ];
+        $pages->{defecttype_edit} = [ undef, undef ];
+    };
 
     return $pages;
 }
@@ -190,4 +194,20 @@ sub user_extra_fields {
 
 sub display_days_ago_threshold { 28 }
 
+sub defect_type_extra_fields {
+    return [
+        'activity_code',
+        'defect_code',
+    ];
+};
+
+sub available_permissions {
+    my $self = shift;
+
+    my $perms = $self->next::method();
+    $perms->{Bodies}->{defect_type_edit} = "Add/edit defect types";
+
+    return $perms;
+}
+
 1;
diff --git a/perllib/FixMyStreet/DB/Result/Body.pm b/perllib/FixMyStreet/DB/Result/Body.pm
index 6dac8821c..82015ad2d 100644
--- a/perllib/FixMyStreet/DB/Result/Body.pm
+++ b/perllib/FixMyStreet/DB/Result/Body.pm
@@ -75,6 +75,12 @@ __PACKAGE__->has_many(
   { "foreign.body_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
+__PACKAGE__->has_many(
+  "defect_types",
+  "FixMyStreet::DB::Result::DefectType",
+  { "foreign.body_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 __PACKAGE__->belongs_to(
   "parent",
   "FixMyStreet::DB::Result::Body",
@@ -112,8 +118,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-09-06 15:33:04
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ZuzscnLqcx0k512cTZ/kdg
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-02-13 15:11:11
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BOJANVwg3kR/1VjDq0LykA
 
 sub url {
     my ( $self, $c, $args ) = @_;
diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm
index f7e8ac5b5..a620b7358 100644
--- a/perllib/FixMyStreet/DB/Result/Contact.pm
+++ b/perllib/FixMyStreet/DB/Result/Contact.pm
@@ -55,6 +55,12 @@ __PACKAGE__->belongs_to(
   { id => "body_id" },
   { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
 );
+__PACKAGE__->has_many(
+  "contact_defect_types",
+  "FixMyStreet::DB::Result::ContactDefectType",
+  { "foreign.contact_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
 __PACKAGE__->has_many(
   "contact_response_priorities",
   "FixMyStreet::DB::Result::ContactResponsePriority",
@@ -69,8 +75,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-09-06 15:33:04
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ocmQGeFJtO3wmvyx6W+EKQ
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-02-13 15:11:11
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:f9VepR/oPyr3z6PUpJ4w2A
 
 __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn");
 __PACKAGE__->rabx_column('extra');
@@ -82,6 +88,7 @@ with 'FixMyStreet::Roles::Extra';
 
 __PACKAGE__->many_to_many( response_templates => 'contact_response_templates', 'response_template' );
 __PACKAGE__->many_to_many( response_priorities => 'contact_response_priorities', 'response_priority' );
+__PACKAGE__->many_to_many( defect_types => 'contact_defect_types', 'defect_type' );
 
 sub get_metadata_for_input {
     my $self = shift;
diff --git a/perllib/FixMyStreet/DB/Result/ContactDefectType.pm b/perllib/FixMyStreet/DB/Result/ContactDefectType.pm
new file mode 100644
index 000000000..2199f0b42
--- /dev/null
+++ b/perllib/FixMyStreet/DB/Result/ContactDefectType.pm
@@ -0,0 +1,46 @@
+use utf8;
+package FixMyStreet::DB::Result::ContactDefectType;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
+__PACKAGE__->table("contact_defect_types");
+__PACKAGE__->add_columns(
+  "id",
+  {
+    data_type         => "integer",
+    is_auto_increment => 1,
+    is_nullable       => 0,
+    sequence          => "contact_defect_types_id_seq",
+  },
+  "contact_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+  "defect_type_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+);
+__PACKAGE__->set_primary_key("id");
+__PACKAGE__->belongs_to(
+  "contact",
+  "FixMyStreet::DB::Result::Contact",
+  { id => "contact_id" },
+  { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
+);
+__PACKAGE__->belongs_to(
+  "defect_type",
+  "FixMyStreet::DB::Result::DefectType",
+  { id => "defect_type_id" },
+  { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
+);
+
+
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-02-13 15:11:11
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:VIczmM0OXXpWgQVpop3SMw
+
+
+# You can replace this text with custom code or comments, and it will be preserved on regeneration
+1;
diff --git a/perllib/FixMyStreet/DB/Result/DefectType.pm b/perllib/FixMyStreet/DB/Result/DefectType.pm
new file mode 100644
index 000000000..a2969f59e
--- /dev/null
+++ b/perllib/FixMyStreet/DB/Result/DefectType.pm
@@ -0,0 +1,66 @@
+use utf8;
+package FixMyStreet::DB::Result::DefectType;
+
+# Created by DBIx::Class::Schema::Loader
+# DO NOT MODIFY THE FIRST PART OF THIS FILE
+
+use strict;
+use warnings;
+
+use base 'DBIx::Class::Core';
+__PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn");
+__PACKAGE__->table("defect_types");
+__PACKAGE__->add_columns(
+  "id",
+  {
+    data_type         => "integer",
+    is_auto_increment => 1,
+    is_nullable       => 0,
+    sequence          => "defect_types_id_seq",
+  },
+  "body_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
+  "name",
+  { data_type => "text", is_nullable => 0 },
+  "description",
+  { data_type => "text", is_nullable => 0 },
+  "extra",
+  { data_type => "text", is_nullable => 1 },
+);
+__PACKAGE__->set_primary_key("id");
+__PACKAGE__->add_unique_constraint("defect_types_body_id_name_key", ["body_id", "name"]);
+__PACKAGE__->belongs_to(
+  "body",
+  "FixMyStreet::DB::Result::Body",
+  { id => "body_id" },
+  { is_deferrable => 0, on_delete => "NO ACTION", on_update => "NO ACTION" },
+);
+__PACKAGE__->has_many(
+  "contact_defect_types",
+  "FixMyStreet::DB::Result::ContactDefectType",
+  { "foreign.defect_type_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+__PACKAGE__->has_many(
+  "problems",
+  "FixMyStreet::DB::Result::Problem",
+  { "foreign.defect_type_id" => "self.id" },
+  { cascade_copy => 0, cascade_delete => 0 },
+);
+
+
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-02-13 15:11:11
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:BBLjb/aAoTKJZerdYCeBMQ
+
+__PACKAGE__->many_to_many( contacts => 'contact_defect_types', 'contact' );
+
+__PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn");
+__PACKAGE__->rabx_column('extra');
+
+use Moo;
+use namespace::clean -except => [ 'meta' ];
+
+with 'FixMyStreet::Roles::Extra';
+
+
+1;
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 0ab52628e..84db41490 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -108,6 +108,8 @@ __PACKAGE__->add_columns(
   { data_type => "text", is_nullable => 1 },
   "response_priority_id",
   { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
+  "defect_type_id",
+  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->has_many(
@@ -116,6 +118,17 @@ __PACKAGE__->has_many(
   { "foreign.problem_id" => "self.id" },
   { cascade_copy => 0, cascade_delete => 0 },
 );
+__PACKAGE__->belongs_to(
+  "defect_type",
+  "FixMyStreet::DB::Result::DefectType",
+  { id => "defect_type_id" },
+  {
+    is_deferrable => 0,
+    join_type     => "LEFT",
+    on_delete     => "NO ACTION",
+    on_update     => "NO ACTION",
+  },
+);
 __PACKAGE__->has_many(
   "moderation_original_datas",
   "FixMyStreet::DB::Result::ModerationOriginalData",
@@ -153,8 +166,8 @@ __PACKAGE__->has_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07035 @ 2016-09-07 11:01:40
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iH9c4VZZN/ONnhN6g89DFw
+# Created by DBIx::Class::Schema::Loader v0.07035 @ 2017-02-13 15:11:11
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8zzWlJX7OQOdvrGxKuZUmg
 
 # Add fake relationship to stored procedure table
 __PACKAGE__->has_one(
@@ -754,6 +767,18 @@ sub response_priorities {
     return $self->result_source->schema->resultset('ResponsePriority')->for_bodies($self->bodies_str_ids, $self->category);
 }
 
+=head2 defect_types
+
+Returns all DefectTypes attached to this problem's category/contact, in
+alphabetical order of name.
+
+=cut
+
+sub defect_types {
+    my $self = shift;
+    return $self->result_source->schema->resultset('DefectType')->for_bodies($self->bodies_str_ids, $self->category);
+}
+
 # returns true if the external id is the council's ref, i.e., useful to publish it
 # (by way of an example, the Oxfordshire send method returns a useful reference when
 # it succeeds, so that is the ref we should show on the problem report page).
diff --git a/perllib/FixMyStreet/DB/ResultSet/DefectType.pm b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
new file mode 100644
index 000000000..a873ef252
--- /dev/null
+++ b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
@@ -0,0 +1,22 @@
+package FixMyStreet::DB::ResultSet::DefectType;
+use base 'DBIx::Class::ResultSet';
+
+use strict;
+use warnings;
+
+sub for_bodies {
+    my ($rs, $bodies, $category) = @_;
+    my $attrs = {
+        'me.body_id' => $bodies,
+    };
+    if ($category) {
+        $attrs->{'contact.category'} = [ $category, undef ];
+    }
+    $rs->search($attrs, {
+        order_by => 'name',
+        join => { 'contact_defect_types' => 'contact' },
+        distinct => 1,
+    });
+}
+
+1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 122a5d0c9..70d5c05ed 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -610,6 +610,7 @@ sub delete_body {
     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;
@@ -641,6 +642,14 @@ 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 create_contact_ok {
     my $self = shift;
     my %contact_params = (
diff --git a/t/app/model/defecttype.t b/t/app/model/defecttype.t
new file mode 100644
index 000000000..0f66ac684
--- /dev/null
+++ b/t/app/model/defecttype.t
@@ -0,0 +1,67 @@
+use strict;
+use warnings;
+use Test::More;
+
+use FixMyStreet::App;
+use FixMyStreet::TestMech;
+my $mech = FixMyStreet::TestMech->new;
+
+my $oxfordshire = $mech->create_body_ok(2237, 'Oxfordshire County Council', id => 2237);
+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 $potholes_defect_type = FixMyStreet::App->model('DB::DefectType')->find_or_create(
+    {
+        body_id => 2237,
+        name => 'Potholes',
+        description => 'This defect type is to do with potholes'
+    }
+);
+$potholes_defect_type->contact_defect_types->find_or_create({
+    contact_id => $potholes_contact->id,
+});
+
+my $general_defect_type = FixMyStreet::App->model('DB::DefectType')->find_or_create(
+    {
+        body_id => 2237,
+        name => 'All categories',
+        description => 'This defect type is for all categories'
+    }
+);
+
+
+subtest 'for_bodies returns correct results' => sub {
+    my $defect_types = FixMyStreet::App->model('DB::DefectType')->for_bodies(
+        [ $oxfordshire->id ],
+        'Potholes'
+    );
+
+    is $defect_types->count, 2, 'Both defect types are included for Potholes category';
+
+    $defect_types = FixMyStreet::App->model('DB::DefectType')->for_bodies(
+        [ $oxfordshire->id ],
+        'Traffic lights'
+    );
+
+    is $defect_types->count, 1, 'Only 1 defect type is included for Traffic lights category';
+    is $defect_types->first->name, $general_defect_type->name, 'Correct defect type is returned for Traffic lights category';
+};
+
+subtest 'Problem->defect_types behaves correctly' => sub {
+    my ($problem) = $mech->create_problems_for_body(1, $oxfordshire->id, 'Test', {
+        category => 'Potholes',
+    });
+
+    is $problem->defect_types->count, 2, 'Both defect types are available for the problem';
+
+    $problem->update({ category => 'Traffic lights' });
+    is $problem->defect_types->count, 1, 'Only 1 defect type is included for Traffic lights category';
+    is $problem->defect_types->first->name, $general_defect_type->name, 'Correct defect type is returned for Traffic lights category';
+};
+
+
+END {
+    $mech->delete_body( $oxfordshire );
+
+    done_testing();
+}
diff --git a/templates/web/base/admin/category-multiselect.html b/templates/web/base/admin/category-multiselect.html
new file mode 100644
index 000000000..98416204f
--- /dev/null
+++ b/templates/web/base/admin/category-multiselect.html
@@ -0,0 +1,10 @@
+<p>
+  <strong>[% loc('Categories:') %]</strong>
+</p>
+<p>
+  <select class="form-control js-multiple" name="categories" id="categories" multiple data-all="[% loc('All categories') %]">
+    [% FOR contact IN contacts %]
+      <option value="[% contact.id %]" [% 'selected' IF contact.active %]>[% contact.category | html %]</option>
+    [% END %]
+  </select>
+</p>
diff --git a/templates/web/base/admin/defecttypes/edit.html b/templates/web/base/admin/defecttypes/edit.html
new file mode 100644
index 000000000..65c8a5ab7
--- /dev/null
+++ b/templates/web/base/admin/defecttypes/edit.html
@@ -0,0 +1,37 @@
+[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Type for %s'), body.name) -%]
+[% dt = defect_type %]
+
+[% UNLESS dt.id %]<h3>[% loc('New defect type') %]</h3>[% END %]
+
+<form method="post"
+    action="[% c.uri_for('', body.id, dt.id || 'new' ) %]"
+    enctype="application/x-www-form-urlencoded"
+    accept-charset="utf-8"
+    class="validate">
+
+    <p>
+        <strong>[% loc('Name:') %] </strong>
+        <input type="text" name="name" class="required form-control" size="30" value="[% dt.name | html %]">
+    </p>
+    <p>
+        <strong>[% loc('Description:') %] </strong>
+        <input type="text" name="description" class="form-control" size="30" value="[% dt.description | html %]">
+    </p>
+
+    <div class="admin-hint">
+      <p>
+        [% loc('If you only want this defect type to be an option for specific categories, pick them here. By default they will show for all categories.') %]
+      </p>
+    </div>
+
+    [% INCLUDE 'admin/category-multiselect.html' %]
+
+    [% TRY %][% INCLUDE 'admin/defecttypes/extra_fields.html' %][% CATCH file %][% END %]
+
+    <p>
+      <input type="hidden" name="token" value="[% csrf_token %]" >
+      <input type="submit" class="btn" name="save" value="[% dt.id ? loc('Save changes') : loc('Create defect type') %]" >
+    </p>
+</form>
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/admin/defecttypes/index.html b/templates/web/base/admin/defecttypes/index.html
new file mode 100644
index 000000000..2e6ce7e1b
--- /dev/null
+++ b/templates/web/base/admin/defecttypes/index.html
@@ -0,0 +1,13 @@
+[% INCLUDE 'admin/header.html' title=loc('Defect Types') -%]
+
+<ul>
+    [% FOR body IN bodies %]
+        <li>
+            <a href="[% c.uri_for('',  body.id) %]">[% body.name %]</a>
+            [% defect_types_count = body.defect_types.count %]
+            [% IF defect_types_count %]([% defect_types_count %])[% END %]
+        </li>
+    [% END %]
+</ul>
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/admin/defecttypes/list.html b/templates/web/base/admin/defecttypes/list.html
new file mode 100644
index 000000000..1a9cb4fa7
--- /dev/null
+++ b/templates/web/base/admin/defecttypes/list.html
@@ -0,0 +1,35 @@
+[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Types for %s'), body.name) -%]
+
+<table>
+    <thead>
+    <tr>
+        <th>  [% loc('Name') %] </th>
+        <th>  [% loc('Description') %] </th>
+        <th>  [% loc('Categories') %] </th>
+        <th>  &nbsp; </th>
+    </tr>
+    </thead>
+    <tbody>
+      [% PROCESS 'defect_type/format.html' %]
+      [% FOR d IN defect_types %]
+          <tr>
+              <td>  [% defect_type_format(defect_type=d) %] </td>
+              <td>  [% d.description | html %] </td>
+              <td>
+                [% UNLESS d.contacts.size %]
+                  <em>[% loc('All categories') %]</em>
+                [% ELSE %]
+                  [% FOR contact IN d.contacts %]
+                    [% contact.category %][% ',' UNLESS loop.last %]
+                  [% END %]
+                [% END %]
+              </td>
+              <td> <a href="[% c.uri_for('', body.id, d.id) %]" class="btn">[% loc('Edit') %]</a> </td>
+          </tr>
+      [% END %]
+    </tbody>
+</table>
+
+<a href="[% c.uri_for('', body.id, 'new') %]" class="btn">[% loc('New defect type') %]</a>
+
+[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/defect_type/format.html b/templates/web/base/defect_type/format.html
new file mode 100644
index 000000000..3c0781501
--- /dev/null
+++ b/templates/web/base/defect_type/format.html
@@ -0,0 +1,9 @@
+[%
+# This template can be overridden by cobrands if they've added extra fields
+# to the DefectType model (e.g Cobrand::Oxfordshire->defect_type_extra_fields)
+# which should be used to represent this DefectType
+# to the user in the inspect form.
+~%]
+[% MACRO defect_type_format BLOCK ~%]
+[%~ defect_type.name | html ~%]
+[%~ END %]
\ No newline at end of file
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 625887eff..5e97de3f4 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -62,18 +62,17 @@
         [% END %]
 
         [% IF permissions.report_inspect %]
-          [% IF c.cobrand.defect_types %]
-            <p>
-              <label for="defect_type">[% loc('Defect type') %]</label>
-              [% defect_type = problem.get_extra_metadata('defect_type') %]
-              <select id="defect_type" name="defect_type" class="form-control">
-                <option value=""[% ' selected' IF NOT defect_type %]>-</option>
-                [% FOREACH dt IN c.cobrand.defect_types.pairs %]
-                  <option[% ' selected' IF defect_type == dt.key %] value="[% dt.key | html %]">[% dt.value | html %]</option>
-                [% END %]
-              </select>
-            </p>
-          [% END %]
+          [% PROCESS 'defect_type/format.html' %]
+          <p>
+            <label for="defect_type">[% loc('Defect type') %]</label>
+            <select id="defect_type" name="defect_type" class="form-control">
+              <option value=""[% ' selected' IF NOT problem.defect_type %]>-</option>
+              [% FOREACH defect_type IN problem.defect_types %]
+                <option[% ' selected' IF problem.defect_type_id == defect_type.id %] value="[% defect_type.id %]">[% defect_type_format() %]</option>
+              [% END %]
+            </select>
+          </p>
+
           <p>
             <label for="state">[% loc('State') %]</label>
             [% INCLUDE 'report/inspect/state_groups_select.html' %]
diff --git a/templates/web/oxfordshire/admin/defecttypes/extra_fields.html b/templates/web/oxfordshire/admin/defecttypes/extra_fields.html
new file mode 100644
index 000000000..73cc54f0c
--- /dev/null
+++ b/templates/web/oxfordshire/admin/defecttypes/extra_fields.html
@@ -0,0 +1,8 @@
+<p>
+    <strong>[% loc('Activity Code:') %] </strong>
+    <input type="text" name="extra[activity_code]" class="form-control" size="30" value="[% dt.get_extra_metadata('activity_code') | html %]">
+</p>
+<p>
+    <strong>[% loc('Defect Code:') %] </strong>
+    <input type="text" name="extra[defect_code]" class="form-control" size="30" value="[% dt.get_extra_metadata('defect_code') | html %]">
+</p>
diff --git a/templates/web/oxfordshire/defect_type/format.html b/templates/web/oxfordshire/defect_type/format.html
new file mode 100644
index 000000000..9cbf2d873
--- /dev/null
+++ b/templates/web/oxfordshire/defect_type/format.html
@@ -0,0 +1,4 @@
+[% MACRO defect_type_format BLOCK ~%]
+[%~ defect_type.get_extra_metadata('defect_code') | html %] - [% defect_type.get_extra_metadata('activity_code') | html %]
+([% defect_type.name | html %])
+[%~ END %]
\ No newline at end of file
diff --git a/web/cobrands/fixmystreet/admin.js b/web/cobrands/fixmystreet/admin.js
index 02eb30766..f7fcaf276 100644
--- a/web/cobrands/fixmystreet/admin.js
+++ b/web/cobrands/fixmystreet/admin.js
@@ -48,6 +48,8 @@ $(function(){
         }
     });
 
+    $("select.js-multiple[multiple]").make_multi();
+
     // on a body's page, hide/show deleted contact categories
     var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
     if ($table_with_deleted_contacts.length == 1) {
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index c09eeb803..e92395661 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -109,6 +109,20 @@ function isR2L() {
                 $drawer.hide();
             });
         });
+    },
+
+    make_multi: function() {
+        var $this = $(this),
+            all = $this.data('all');
+        $this.multiSelect({
+            allText: all,
+            noneText: all,
+            positionMenuWithin: $('#side'),
+            presets: [{
+                name: all,
+                options: []
+            }]
+        });
     }
 
   });
@@ -535,23 +549,8 @@ $.extend(fixmystreet.set_up, {
     // to refresh the map when the filter inputs are changed.
     $(".report-list-filters [type=submit]").hide();
 
-    function make_multi(id) {
-        var $id = $('#' + id),
-            all = $id.data('all'),
-            none = $id.data('none') || all,
-            allOpts = $id.data('allOptions') || [];
-        $id.multiSelect({
-            allText: all,
-            noneText: none,
-            positionMenuWithin: $('#side'),
-            presets: [{
-                name: all,
-                options: allOpts
-            }]
-        });
-    }
-    make_multi('statuses');
-    make_multi('filter_categories');
+    $('#statuses').make_multi();
+    $('#filter_categories').make_multi();
   },
 
   mobile_ui_tweaks: function() {
-- 
cgit v1.2.3


From 8bdf783d5d18dde25b4d2f8309a42c6096cf09d3 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Mar 2017 17:23:07 +0000
Subject: Always include MapIt mock handler in all tests.

---
 perllib/FixMyStreet/TestMech.pm      | 1 +
 t/Mock/MapIt.pm                      | 3 +++
 t/app/controller/admin.t             | 3 ---
 t/app/controller/admin_permissions.t | 4 ----
 t/app/controller/around.t            | 4 ----
 t/app/controller/auth_social.t       | 3 ---
 t/app/controller/report_as_other.t   | 3 ---
 t/app/controller/report_import.t     | 4 ----
 t/cobrand/fixamingata.t              | 8 +-------
 9 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 122a5d0c9..902ae7a5a 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -10,6 +10,7 @@ BEGIN {
 }
 
 use Test::WWW::Mechanize::Catalyst 'FixMyStreet::App';
+use t::Mock::MapIt;
 use Test::More;
 use Web::Scraper;
 use Carp;
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index 9aa8b7e40..c3bafc6ca 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -2,6 +2,7 @@ package t::Mock::MapIt;
 
 use JSON::MaybeXS;
 use Web::Simple;
+use LWP::Protocol::PSGI;
 
 use mySociety::Locale;
 
@@ -71,4 +72,6 @@ sub postcode {
     };
 }
 
+LWP::Protocol::PSGI->register(t::Mock::MapIt->to_psgi_app, host => 'mapit.uk');
+
 __PACKAGE__->run_if_script;
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index ab6cac842..be3d6d08e 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -1,9 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
-use t::Mock::MapIt;
 use FixMyStreet::TestMech;
 
 my $mech = FixMyStreet::TestMech->new;
@@ -1204,7 +1202,6 @@ my %default_perms = (
 FixMyStreet::override_config {
     MAPIT_URL => 'http://mapit.uk/',
 }, sub {
-    LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.uk');
     for my $test (
         {
             desc => 'edit user name',
diff --git a/t/app/controller/admin_permissions.t b/t/app/controller/admin_permissions.t
index 4b05660cc..dd256173d 100644
--- a/t/app/controller/admin_permissions.t
+++ b/t/app/controller/admin_permissions.t
@@ -1,9 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
-use t::Mock::MapIt;
 use FixMyStreet::TestMech;
 
 my $mech = FixMyStreet::TestMech->new;
@@ -84,8 +82,6 @@ FixMyStreet::override_config {
     MAPIT_URL => 'http://mapit.uk/',
     ALLOWED_COBRANDS => [ 'oxfordshire' ],
 }, sub {
-    LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.uk');
-
     my $user2_id = $user2->id;
     $report->update({ bodies_str => $oxfordshire->id });
 
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index 9e2e7c524..eece843a8 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -1,9 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
-use t::Mock::MapIt;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
@@ -84,8 +82,6 @@ foreach my $test (
   )
 {
     subtest "check lat/lng for '$test->{pc}'" => sub {
-        LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.uk');
-
         $mech->get_ok('/');
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index f3eae32a7..52cc2766c 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -7,7 +7,6 @@ use JSON::MaybeXS;
 
 use t::Mock::Facebook;
 use t::Mock::Twitter;
-use t::Mock::MapIt;
 
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
@@ -18,8 +17,6 @@ END { FixMyStreet::App->log->enable('info'); }
 
 my ($report) = $mech->create_problems_for_body(1, '2345', 'Test');
 
-LWP::Protocol::PSGI->register(t::Mock::MapIt->to_psgi_app, host => 'mapit.uk');
-
 FixMyStreet::override_config {
     FACEBOOK_APP_ID => 'facebook-app-id',
     TWITTER_KEY => 'twitter-key',
diff --git a/t/app/controller/report_as_other.t b/t/app/controller/report_as_other.t
index b4405be57..a0597c7c6 100644
--- a/t/app/controller/report_as_other.t
+++ b/t/app/controller/report_as_other.t
@@ -1,9 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
-use t::Mock::MapIt;
 use FixMyStreet::TestMech;
 use FixMyStreet::App;
 
@@ -134,7 +132,6 @@ END {
 
 sub start_report {
     my $permission = shift;
-    LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.uk');
     $_->delete for $user->user_body_permissions;
     $user->user_body_permissions->create({ body => $body, permission_type => $permission })
         if $permission;
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index 6c0da221c..9201f600c 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -1,9 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
-use t::Mock::MapIt;
 use FixMyStreet::TestMech;
 use FixMyStreet::App;
 use Web::Scraper;
@@ -92,8 +90,6 @@ subtest "Test creating bad partial entries" => sub {
 };
 
 subtest "Submit a correct entry" => sub {
-    LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.uk');
-
     $mech->get_ok('/import');
 
     $mech->submit_form_ok(    #
diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t
index 2ef3c09b4..dacf4325a 100644
--- a/t/cobrand/fixamingata.t
+++ b/t/cobrand/fixamingata.t
@@ -1,14 +1,12 @@
 use strict;
 use warnings;
 use Test::More;
-use LWP::Protocol::PSGI;
 
 BEGIN {
     use FixMyStreet;
     FixMyStreet->test_mode(1);
 }
 
-use t::Mock::MapIt;
 use mySociety::Locale;
 
 use FixMyStreet::TestMech;
@@ -101,13 +99,9 @@ subtest "Test ajax decimal points" => sub {
     # requesting the page, so that the code performs a full switch to Swedish
     mySociety::Locale::push('en-gb');
 
-    # A note to the future - the run_if_script line must be within a subtest
-    # otherwise it fails to work
-    LWP::Protocol::PSGI->register(t::Mock::MapIt->run_if_script, host => 'mapit.sweden');
-
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'fixamingata' ],
-        MAPIT_URL => 'http://mapit.sweden/'
+        MAPIT_URL => 'http://mapit.uk/'
     }, sub {
         $mech->get_ok('/ajax/lookup_location?term=12345');
         # We want an actual decimal point in a JSON response...
-- 
cgit v1.2.3


From 6713d6a4cd04a6e91743f687347367f070538e63 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 21 Mar 2017 18:26:39 +0000
Subject: Make sure all MapIt tests can run offline.

---
 perllib/FixMyStreet/App/Controller/Auth.pm |  2 +-
 t/Mock/MapIt.pm                            | 97 ++++++++++++++++++++----------
 t/app/controller/admin.t                   |  3 +-
 t/app/controller/alert.t                   | 24 ++++----
 t/app/controller/alert_new.t               | 18 +++---
 t/app/controller/around.t                  | 16 ++---
 t/app/controller/auth.t                    |  4 ++
 t/app/controller/auth_social.t             |  6 ++
 t/app/controller/dashboard.t               |  4 +-
 t/app/controller/index.t                   |  9 +--
 t/app/controller/photo.t                   |  2 +-
 t/app/controller/report_as_other.t         | 10 +--
 t/app/controller/report_import.t           | 10 ++-
 t/app/controller/report_inspect.t          |  4 +-
 t/app/controller/report_new.t              | 55 +++++++++--------
 t/app/controller/report_new_mobile.t       |  8 ++-
 t/app/controller/report_new_open311.t      |  8 +--
 t/app/controller/reports.t                 | 14 ++---
 t/app/controller/rss.t                     |  6 +-
 t/app/model/alert_type.t                   |  6 +-
 t/app/model/user.t                         |  4 +-
 t/cobrand/fixamingata.t                    |  5 ++
 t/cobrand/form_extras.t                    |  2 +-
 23 files changed, 183 insertions(+), 134 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 70821f79d..4efa7abb8 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -104,7 +104,7 @@ sub sign_in : Private {
 
 Email the user the details they need to sign in. Don't check for an account - if
 there isn't one we can create it when they come back with a token (which
-contains the email addresss).
+contains the email address).
 
 =cut
 
diff --git a/t/Mock/MapIt.pm b/t/Mock/MapIt.pm
index c3bafc6ca..43d44d519 100644
--- a/t/Mock/MapIt.pm
+++ b/t/Mock/MapIt.pm
@@ -13,42 +13,83 @@ has json => (
     },
 );
 
+sub output {
+    my ($self, $response) = @_;
+    # We must make sure we output correctly for testing purposes, we might
+    # be within a different locale here...
+    my $json = mySociety::Locale::in_gb_locale {
+        $self->json->encode($response) };
+    return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+}
+
+my @PLACES = (
+    [ 'EH1 1BB', 55.952055, -3.189579, 2651, 'Edinburgh City Council', 'UTA', 20728, 'City Centre', 'UTE' ],
+    [ 'SW1A 1AA', 51.501009, -0.141588, 2504, 'Westminster City Council', 'LBO' ],
+    [ 'GL50 2PR', 51.896268, -2.093063, 2226, 'Gloucestershire County Council', 'CTY', 2326, 'Cheltenham Borough Council', 'DIS', 4544, 'Lansdown', 'DIW', 143641, 'Lansdown and Park', 'CED' ],
+    [ '?', 51.754926, -1.256179, 2237, 'Oxfordshire County Council', 'CTY', 2421, 'Oxford City Council', 'DIS' ],
+    [ 'BR1 3UH', 51.4021, 0.01578, 2482, 'Bromley Council', 'LBO' ],
+    [ '?', 50.78301, -0.646929 ],
+    [ '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' ],
+);
+
 sub dispatch_request {
     my $self = shift;
 
     sub (GET + /postcode/*) {
         my ($self, $postcode) = @_;
-        my $response = $self->postcode($postcode);
-        # We must make sure we output correctly for testing purposes, we might
-        # be within a different locale here...
-        my $json = mySociety::Locale::in_gb_locale {
-            $self->json->encode($response) };
-        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+        foreach (@PLACES) {
+            if ($postcode eq $_->[0] || $postcode eq $_->[0] =~ s/ //gr) {
+                return $self->output({wgs84_lat => $_->[1], wgs84_lon => $_->[2], postcode => $postcode, coordsyst => 'G'});
+            }
+        }
+        my $response = {
+            wgs84_lat => 51.5, wgs84_lon => -2.1, postcode => $postcode, coordsyst => 'G',
+        };
+        return $self->output($response);
     },
 
-    sub (GET + /point/**) {
+    sub (GET + /point/**.*) {
         my ($self, $point) = @_;
+        foreach (@PLACES) {
+            if ($point eq "4326/$_->[2],$_->[1]") {
+                my %out;
+                for (my $i=3; $i<@$_; $i+=3) {
+                    $out{"$_->[$i]"} = { id => $_->[$i], name => $_->[$i+1], type => $_->[$i+2] };
+                }
+                return $self->output(\%out);
+            }
+        }
         my $response = {
             "63999" => {"parent_area" => 2245, "generation_high" => 25, "all_names" => {}, "id" => 63999, "codes" => {"ons" => "00HYNS", "gss" => "E05008366", "unit_id" => "44025"}, "name" => "Kington", "country" => "E", "type_name" => "Unitary Authority electoral division (UTE)", "generation_low" => 12, "country_name" => "England", "type" => "UTE"},
-            "65822" => {"parent_area" => undef, "generation_high" => 25, "all_names" => {}, "id" => 65822, "codes" => {"gss" => "E14000860", "unit_id" => "24903"}, "name" => "North Wiltshire", "country" => "E", "type_name" => "UK Parliament constituency", "generation_low" => 13, "country_name" => "England", "type" => "WMC"},
-            "11814" => {"parent_area" => undef, "generation_high" => 25, "all_names" => {}, "id" => 11814, "codes" => {"ons" => "09", "gss" => "E15000009", "unit_id" => "41427"}, "name" => "South West", "country" => "E", "type_name" => "European region", "generation_low" => 1, "country_name" => "England", "type" => "EUR"},
             "2245" => {"parent_area" => undef, "generation_high" => 25, "all_names" => {}, "id" => 2245, "codes" => {"ons" => "00HY", "gss" => "E06000054", "unit_id" => "43925"}, "name" => "Wiltshire Council", "country" => "E", "type_name" => "Unitary Authority", "generation_low" => 11, "country_name" => "England", "type" => "UTA"}
         };
-        # We must make sure we output correctly for testing purposes, we might
-        # be within a different locale here...
-        my $json = mySociety::Locale::in_gb_locale {
-            $self->json->encode($response) };
-        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+        return $self->output($response);
+    },
+
+    sub (GET + /areas/*) {
+        my ($self, $areas) = @_;
+        if ($areas eq 'Hart') {
+            $self->output({2333 => {parent_area => undef, id => 2333, name => "Hart District Council", type => "DIS"}});
+        } elsif ($areas eq 'Birmingham') {
+            $self->output({2514 => {parent_area => undef, id => 2514, name => "Birmingham City Council", type => "MTD"}});
+        } elsif ($areas eq 'Gloucestershire') {
+            $self->output({2226 => {parent_area => undef, id => 2226, name => "Gloucestershire County Council", type => "CTY"}});
+        } elsif ($areas eq 'Cheltenham') {
+            $self->output({2326 => {parent_area => undef, id => 2326, name => "Cheltenham Borough Council", type => "DIS"}});
+        } elsif ($areas eq 'Lansdown and Park') {
+            $self->output({22261 => {parent_area => 2226, id => 22261, name => "Lansdown and Park", type => "CED"}});
+        } elsif ($areas eq 'Lansdown') {
+            $self->output({23261 => {parent_area => 2326, id => 23261, name => "Lansdown", type => "DIW"}});
+        } elsif ($areas eq 'UTA') {
+            $self->output({2650 => {parent_area => undef, id => 2650, name => "Aberdeen Council", type => "UTA"}});
+        }
     },
 
     sub (GET + /area/*) {
         my ($self, $area) = @_;
-        my $response = {"parent_area" => undef, "generation_high" => 25, "all_names" => {}, "id" => 2245, "codes" => {"ons" => "00HY", "gss" => "E06000054", "unit_id" => "43925"}, "name" => "Wiltshire Council", "country" => "E", "type_name" => "Unitary Authority", "generation_low" => 11, "country_name" => "England", "type" => "UTA"};
-        # We must make sure we output correctly for testing purposes, we might
-        # be within a different locale here...
-        my $json = mySociety::Locale::in_gb_locale {
-            $self->json->encode($response) };
-        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+        my $response = { "id" => $area, "name" => "Area $area", "type" => "UTA" };
+        return $self->output($response);
     },
 
     sub (GET + /area/*/children) {
@@ -57,19 +98,13 @@ sub dispatch_request {
             "60705" => { "parent_area" => 2245, "generation_high" => 25, "all_names" => { }, "id" => 60705, "codes" => { "ons" => "00HY226", "gss" => "E04011842", "unit_id" => "17101" }, "name" => "Trowbridge", "country" => "E", "type_name" => "Civil parish/community", "generation_low" => 12, "country_name" => "England", "type" => "CPC" },
             "62883" => { "parent_area" => 2245, "generation_high" => 25, "all_names" => { }, "id" => 62883, "codes" => { "ons" => "00HY026", "gss" => "E04011642", "unit_id" => "17205" }, "name" => "Bradford-on-Avon", "country" => "E", "type_name" => "Civil parish/community", "generation_low" => 12, "country_name" => "England", "type" => "CPC" },
         };
-        # We must make sure we output correctly for testing purposes, we might
-        # be within a different locale here...
-        my $json = mySociety::Locale::in_gb_locale {
-            $self->json->encode($response) };
-        return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ];
+        return $self->output($response);
     },
-}
 
-sub postcode {
-    my ($self, $postcode) = @_;
-    return {
-        wgs84_lat => 51.5, wgs84_lon => -2.1, postcode => $postcode, coordsyst => 'G',
-    };
+    sub (GET + /area/*/example_postcode) {
+        my ($self, $area) = @_;
+        return [ 200, [ 'Content-Type' => 'application/json' ], [ '"AB12 1AA"' ] ];
+    },
 }
 
 LWP::Protocol::PSGI->register(t::Mock::MapIt->to_psgi_app, host => 'mapit.uk');
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index be3d6d08e..2fdd8b74a 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -146,7 +146,7 @@ subtest 'check summary counts' => sub {
 
 # This override is wrapped around ALL the /admin/body tests
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
     MAPIT_TYPES => [ 'UTA' ],
     BASE_URL => 'http://www.example.org',
 }, sub {
@@ -578,7 +578,6 @@ foreach my $test (
 }
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
     ALLOWED_COBRANDS => 'fixmystreet',
 }, sub {
 
diff --git a/t/app/controller/alert.t b/t/app/controller/alert.t
index c42eba6b8..cb5949b8f 100644
--- a/t/app/controller/alert.t
+++ b/t/app/controller/alert.t
@@ -17,7 +17,7 @@ $mech->content_contains('html class="no-js" lang="en-gb"');
 # check that we can get list page
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
     GEOCODER => '',
 }, sub {
     $mech->get_ok('/alert/list');
@@ -25,21 +25,21 @@ FixMyStreet::override_config {
     $mech->content_contains('Local RSS feeds and email alerts');
     $mech->content_contains('html class="no-js" lang="en-gb"');
 
-    $mech->get_ok('/alert/list?pc=EH99 1SP');
+    $mech->get_ok('/alert/list?pc=EH1 1BB');
     $mech->title_like(qr/^Local RSS feeds and email alerts/);
-    $mech->content_contains('Here are the types of local problem alerts for &lsquo;EH99&nbsp;1SP&rsquo;');
+    $mech->content_contains('Here are the types of local problem alerts for &lsquo;EH1&nbsp;1BB&rsquo;');
     $mech->content_contains('html class="no-js" lang="en-gb"');
     $mech->content_contains('Problems within 10.0km');
-    $mech->content_contains('rss/pc/EH991SP/2');
-    $mech->content_contains('rss/pc/EH991SP/5');
-    $mech->content_contains('rss/pc/EH991SP/10');
-    $mech->content_contains('rss/pc/EH991SP/20');
-    $mech->content_contains('Problems within City of Edinburgh');
+    $mech->content_contains('rss/pc/EH11BB/2');
+    $mech->content_contains('rss/pc/EH11BB/5');
+    $mech->content_contains('rss/pc/EH11BB/10');
+    $mech->content_contains('rss/pc/EH11BB/20');
+    $mech->content_contains('Problems within Edinburgh City');
     $mech->content_contains('Problems within City Centre ward');
-    $mech->content_contains('/rss/reports/City+of+Edinburgh');
-    $mech->content_contains('/rss/reports/City+of+Edinburgh/City+Centre');
-    $mech->content_contains('council:2651:City_of_Edinburgh');
-    $mech->content_contains('ward:2651:20728:City_of_Edinburgh:City_Centre');
+    $mech->content_contains('/rss/reports/Edinburgh');
+    $mech->content_contains('/rss/reports/Edinburgh/City+Centre');
+    $mech->content_contains('council:2651:Edinburgh');
+    $mech->content_contains('ward:2651:20728:Edinburgh:City_Centre');
 
     subtest "Test Nominatim lookup" => sub {
         LWP::Protocol::PSGI->register(t::Mock::Nominatim->run_if_script, host => 'nominatim.openstreetmap.org');
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 1b85adf7e..729f3a267 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -208,7 +208,7 @@ foreach my $test (
 
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok('/alert/list?pc=EH991SP');
         };
@@ -312,7 +312,7 @@ subtest "Test two-tier council alerts" => sub {
     ) {
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok( '/alert/list?pc=GL502PR' );
             $mech->submit_form_ok( {
@@ -351,7 +351,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         $mech->get_ok( '/alert' );
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => 'EH11BB' } } );
             $mech->submit_form_ok( {
@@ -436,7 +436,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
     ok $update, "created test update - $update_id";
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         FixMyStreet::App->model('DB::AlertType')->email_alerts();
     };
@@ -447,7 +447,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
     for (@emails) {
         my $body = $mech->get_text_body_from_email($_);
         $count++ if $body =~ /The following updates have been left on this report:/;
-        $count++ if $body =~ /The following new FixMyStreet reports have been added in the City of\s+Edinburgh\s+Council area:/;
+        $count++ if $body =~ /The following new FixMyStreet reports have been added in the Area 2651 area:/;
         $count++ if $body =~ /The following FixMyStreet reports have been made within the area you\s+specified:/;
         $count++ if $body =~ /\s+-\s+Testing/;
     }
@@ -542,7 +542,7 @@ subtest "Test signature template is used from cobrand" => sub {
 
     $mech->clear_emails_ok;
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
         ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
     }, sub {
         FixMyStreet::App->model('DB::AlertType')->email_alerts();
@@ -570,7 +570,7 @@ subtest "Test signature template is used from cobrand" => sub {
 
     $mech->clear_emails_ok;
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
         ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
     }, sub {
         FixMyStreet::App->model('DB::AlertType')->email_alerts();
@@ -665,7 +665,7 @@ for my $test (
 
         $mech->clear_emails_ok;
         FixMyStreet::override_config {
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             FixMyStreet::App->model('DB::AlertType')->email_alerts();
         };
@@ -673,7 +673,7 @@ for my $test (
 
         $report->update( { non_public => 0 } );
         FixMyStreet::override_config {
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             FixMyStreet::App->model('DB::AlertType')->email_alerts();
         };
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index eece843a8..c8aca04aa 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -15,7 +15,7 @@ subtest "check that if no query we get sent back to the homepage" => sub {
 subtest "redirect x,y requests to lat/lon (301 - permanent)" => sub {
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok('/around?x=3281&y=1113');
     };
@@ -71,8 +71,8 @@ foreach my $test (
 foreach my $test (
     {
         pc        => 'SW1A 1AA',
-        latitude  => '51.5',
-        longitude => '-2.1',
+        latitude  => '51.501009',
+        longitude => '-0.141588',
     },
     {
         pc        => 'TQ 388 773',
@@ -98,7 +98,7 @@ foreach my $test (
 
 subtest 'check non public reports are not displayed on around page' => sub {
     my $params = {
-        postcode  => 'EH99 1SP',
+        postcode  => 'EH1 1BB',
         latitude  => 55.9519637512,
         longitude => -3.17492254484,
     };
@@ -108,9 +108,9 @@ 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.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
             "good location" );
     };
     $mech->content_contains( 'Around page Test 3 for 2651',
@@ -122,9 +122,9 @@ 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.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP' } },
+        $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB' } },
             "good location" );
     };
     $mech->content_lacks( 'Around page Test 3 for 2651',
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 22ade6f4b..3a11cfc4a 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -56,6 +56,10 @@ for my $test (
     is_deeply $mech->page_errors, [ $error_message ], 'errors match';
 }
 
+# Email address parsing should pass from here
+my $resolver = Test::MockModule->new('Email::Valid');
+$resolver->mock('address', sub { $_[1] });
+
 # create a new account
 $mech->clear_emails_ok;
 $mech->get_ok('/auth');
diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t
index 52cc2766c..09fdf22d3 100644
--- a/t/app/controller/auth_social.t
+++ b/t/app/controller/auth_social.t
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::MockModule;
 use LWP::Protocol::PSGI;
 use LWP::Simple;
 use JSON::MaybeXS;
@@ -27,6 +28,9 @@ FixMyStreet::override_config {
 my $fb_email = 'facebook@example.org';
 my $fb_uid = 123456789;
 
+my $resolver = Test::MockModule->new('Email::Valid');
+$resolver->mock('address', sub { 'facebook@example.org' });
+
 for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) {
     for my $page ( 'my', 'report', 'update' ) {
         subtest "test FB '$fb_state' login for page '$page'" => sub {
@@ -135,6 +139,8 @@ for my $fb_state ( 'refused', 'no email', 'existing UID', 'okay' ) {
     }
 }
 
+$resolver->mock('address', sub { 'twitter@example.org' });
+
 my $tw_email = 'twitter@example.org';
 my $tw_uid = 987654321;
 
diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
index 5ea5cb9f5..903affdcf 100644
--- a/t/app/controller/dashboard.t
+++ b/t/app/controller/dashboard.t
@@ -25,7 +25,7 @@ my $p_user = $mech->create_user_ok('p_user@example.com');
 set_absolute_time('2014-03-01T12:00:00');
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
 
     $mech->not_logged_in_ok;
@@ -48,7 +48,7 @@ FixMyStreet::override_config {
         with_fields => { email => $test_user, password_sign_in => $test_pass }
     } );
 
-    $mech->content_contains( 'City of Edinburgh' );
+    $mech->content_contains( 'Area 2651' );
 
     FixMyStreet::App->model('DB::Contact')->search( { body_id => $body->id } )
       ->delete;
diff --git a/t/app/controller/index.t b/t/app/controller/index.t
index 6752d4d7e..6b28a03d2 100644
--- a/t/app/controller/index.t
+++ b/t/app/controller/index.t
@@ -12,12 +12,7 @@ subtest "check that the form goes to /around" => sub {
     $mech->get_ok('/');
     is $mech->uri->path, '/', "still on '/'";
 
-    # submit form
-    FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
-    }, sub {
-        $mech->submit_form_ok( { with_fields => { pc => 'SW1A 1AA', } } );
-    };
+    $mech->submit_form_ok( { with_fields => { pc => 'SW1A 1AA', } } );
 
     # check that we are at /around
     is $mech->uri->path, '/around', "Got to /around";
@@ -52,7 +47,7 @@ subtest "does pc, (x,y), (e,n) or (lat,lon) go to /around" => sub {
 
         # get the uri and check for 302
         FixMyStreet::override_config {
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok($uri);
         };
diff --git a/t/app/controller/photo.t b/t/app/controller/photo.t
index 69c2ae866..ad857b5e3 100644
--- a/t/app/controller/photo.t
+++ b/t/app/controller/photo.t
@@ -30,7 +30,7 @@ subtest "Check multiple upload worked" => sub {
     # submit initial pc form
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
         UPLOAD_DIR => $UPLOAD_DIR,
     }, sub {
 
diff --git a/t/app/controller/report_as_other.t b/t/app/controller/report_as_other.t
index a0597c7c6..551a59481 100644
--- a/t/app/controller/report_as_other.t
+++ b/t/app/controller/report_as_other.t
@@ -11,7 +11,7 @@ END { FixMyStreet::App->log->enable('info'); }
 
 my $mech = FixMyStreet::TestMech->new;
 
-my $body = $mech->create_body_ok(2245, 'Wiltshire Council');
+my $body = $mech->create_body_ok(2237, 'Oxfordshire County Council');
 my $contact1 = $mech->create_contact_ok( body_id => $body->id, category => 'Street lighting', email => 'highways@example.com' );
 my $contact2 = $mech->create_contact_ok( body_id => $body->id, category => 'Potholes', email => 'potholes@example.com' );
 
@@ -36,7 +36,7 @@ subtest "Body user, has permission to add report as council" => sub {
         detail => 'Test report details.',
         category => 'Street lighting',
     );
-    is $report->name, 'Wiltshire Council', 'report name is body';
+    is $report->name, 'Oxfordshire County Council', 'report name is body';
     is $report->user->name, 'Body User', 'user name unchanged';
     is $report->user->id, $user->id, 'user matches';
     is $report->anonymous, 0, 'report not anonymous';
@@ -57,7 +57,7 @@ subtest "Body user, has permission to add report as another user" => sub {
     is $report->user->name, 'Another User', 'user name matches';
     is $report->user->email, 'another@example.net', 'user email correct';
     isnt $report->user->id, $user->id, 'user does not match';
-    like $mech->get_text_body_from_email, qr/Your report to Wiltshire Council has been logged/;
+    like $mech->get_text_body_from_email, qr/Your report to Oxfordshire County Council has been logged/;
     push @users, $report->user;
 };
 
@@ -76,7 +76,7 @@ subtest "Body user, has permission to add report as another (existing) user" =>
     is $report->user->name, 'Existing User', 'user name remains same';
     is $report->user->email, 'existing@example.net', 'user email correct';
     isnt $report->user->id, $user->id, 'user does not match';
-    like $mech->get_text_body_from_email, qr/Your report to Wiltshire Council has been logged/;
+    like $mech->get_text_body_from_email, qr/Your report to Oxfordshire County Council has been logged/;
     push @users, $report->user;
 };
 
@@ -86,7 +86,7 @@ subtest "Body user, has permission to add update as council" => sub {
         form_as => 'body',
         update => 'Test Update',
     );
-    is $update->name, 'Wiltshire Council', 'update name is body';
+    is $update->name, 'Oxfordshire County Council', 'update name is body';
     is $update->user->name, 'Body User', 'user name unchanged';
     is $update->user->id, $user->id, 'user matches';
     is $update->anonymous, 0, 'update not anonymous';
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index 9201f600c..b956b61ae 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -6,6 +6,10 @@ use FixMyStreet::TestMech;
 use FixMyStreet::App;
 use Web::Scraper;
 use Path::Class;
+use LWP::Protocol::PSGI;
+use t::Mock::MapItZurich;
+
+LWP::Protocol::PSGI->register(t::Mock::MapItZurich->to_psgi_app, host => 'mapit.zurich');
 
 my $mech = FixMyStreet::TestMech->new;
 $mech->get_ok('/import');
@@ -255,7 +259,7 @@ subtest "Submit a correct entry (with location)" => sub {
     # go to the token url
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok($token_url);
     };
@@ -281,7 +285,7 @@ subtest "Submit a correct entry (with location)" => sub {
     # change the details
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok(    #
             {
@@ -314,7 +318,7 @@ subtest "Submit a correct entry (with location)" => sub {
 subtest "Submit a correct entry (with location) to cobrand" => sub {
   FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'zurich' ],
-    MAPIT_URL => 'http://global.mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.zurich/',
     MAPIT_TYPES => [ 'O08' ],
     MAPIT_ID_WHITELIST => [],
     MAP_TYPE => 'Zurich,OSM',
diff --git a/t/app/controller/report_inspect.t b/t/app/controller/report_inspect.t
index cc98f2b64..69e43ad99 100644
--- a/t/app/controller/report_inspect.t
+++ b/t/app/controller/report_inspect.t
@@ -34,7 +34,7 @@ my $user = $mech->log_in_ok('test@example.com');
 $user->update( { from_body => $oxon } );
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
     ALLOWED_COBRANDS => 'fixmystreet',
 }, sub {
     subtest "test inspect page" => sub {
@@ -177,7 +177,6 @@ FixMyStreet::override_config {
 };
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
     ALLOWED_COBRANDS => 'oxfordshire',
 }, sub {
     subtest "test negative reputation" => sub {
@@ -215,7 +214,6 @@ FixMyStreet::override_config {
 };
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
     ALLOWED_COBRANDS => [ 'oxfordshire', 'fixmystreet' ],
     BASE_URL => 'http://fixmystreet.site',
 }, sub {
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index c4dd30e47..fd3108438 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -25,7 +25,7 @@ subtest "test that bare requests to /report/new get redirected" => sub {
     is_deeply { $mech->uri->query_form }, {}, "query empty";
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok('/report/new?pc=SW1A%201AA');
     };
@@ -476,7 +476,7 @@ foreach my $test (
         # submit initial pc form
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
                 "submit location" );
@@ -549,7 +549,7 @@ foreach my $test (
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -665,7 +665,7 @@ subtest "test password errors for a user who is signing in as they report" => su
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -717,7 +717,7 @@ subtest "test report creation for a user who is signing in as they report" => su
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -813,7 +813,7 @@ foreach my $test (
         $mech->get_ok('/around');
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => 'GL50 2PR', } },
                 "submit location" );
@@ -912,7 +912,7 @@ subtest "test report creation for a category that is non public" => sub {
     $mech->get_ok('/around');
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
             "submit location" );
@@ -974,7 +974,7 @@ $contact2->update;
 my $extra_details;
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=' . $saved_lat . '&longitude=' . $saved_lon );
 };
@@ -983,7 +983,7 @@ ok !$extra_details->{titles_list}, 'Non Bromley does not send back list of title
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $extra_details = $mech->get_ok_json( '/report/new/ajax?latitude=51.4021&longitude=0.01578');
 };
@@ -1003,7 +1003,7 @@ subtest "check that a lat/lon off coast leads to /around" => sub {
     my $off_coast_longitude = -0.646929;
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok(    #
             "/report/new"
@@ -1025,7 +1025,7 @@ for my $test (
     {
         desc  => 'user title not set if not bromley problem',
         host  => 'www.fixmystreet.com',
-        postcode => 'EH99 1SP',
+        postcode => 'EH1 1BB',
         fms_extra_title => '',
         extra => [],
         user_title => undef,
@@ -1076,7 +1076,7 @@ for my $test (
     subtest $test->{desc} => sub {
         my $override = {
             ALLOWED_COBRANDS => [ $test->{host} =~ /bromley/ ? 'bromley' : 'fixmystreet' ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         };
 
         $mech->host( $test->{host} );
@@ -1193,9 +1193,9 @@ subtest 'user title not reset if no user title in submission' => sub {
         $mech->get_ok('/');
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
-            $mech->submit_form_ok( { with_fields => { pc => 'EH99 1SP', } },
+            $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } },
                 "submit location" );
             $mech->follow_link_ok(
                 { text_regex => qr/skip this step/i, },
@@ -1258,7 +1258,7 @@ subtest "test Hart" => sub {
             FixMyStreet::override_config {
                 ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ],
                 BASE_URL => 'http://www.fixmystreet.com',
-                MAPIT_URL => 'http://mapit.mysociety.org/',
+                MAPIT_URL => 'http://mapit.uk/',
             }, sub {
                 $mech->get_ok('/around');
                 $mech->content_contains( "Hart Council" );
@@ -1434,7 +1434,7 @@ subtest "test SeeSomething" => sub {
             $mech->get_ok( '/around' );
             FixMyStreet::override_config {
                 ALLOWED_COBRANDS => [ 'seesomething' ],
-                MAPIT_URL => 'http://mapit.mysociety.org/',
+                MAPIT_URL => 'http://mapit.uk/',
             }, sub {
                 $mech->submit_form_ok(
                     {
@@ -1481,15 +1481,15 @@ subtest "test SeeSomething" => sub {
 subtest "categories from deleted bodies shouldn't be visible for new reports" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
-        $mech->get_ok('/report/new/ajax?latitude=51.89&longitude=-2.09'); # Cheltenham
+        $mech->get_ok('/report/new/ajax?latitude=51.896268&longitude=-2.093063'); # Cheltenham
         ok $mech->content_contains( $contact3->category );
 
         # Delete the body which the contact belongs to.
         $contact3->body->update( { deleted => 1 } );
 
-        $mech->get_ok('/report/new/ajax?latitude=51.89&longitude=-2.09'); # Cheltenham
+        $mech->get_ok('/report/new/ajax?latitude=51.896268&longitude=-2.093063'); # Cheltenham
         ok $mech->content_lacks( $contact3->category );
 
         $contact3->body->update( { deleted => 0 } );
@@ -1499,12 +1499,12 @@ subtest "categories from deleted bodies shouldn't be visible for new reports" =>
 subtest "unresponsive body handling works" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         # Test body-level send method
         my $old_send = $contact1->body->send_method;
         $contact1->body->update( { send_method => 'Refused' } );
-        $mech->get_ok('/report/new/ajax?latitude=55.9&longitude=-3.2'); # Edinburgh
+        $mech->get_ok('/report/new/ajax?latitude=55.952055&longitude=-3.189579'); # Edinburgh
         my $body_id = $contact1->body->id;
         ok $mech->content_like( qr{Edinburgh.*accept reports.*/unresponsive\?body=$body_id} );
 
@@ -1553,8 +1553,8 @@ subtest "unresponsive body handling works" => sub {
             phone               => '07903 123 456',
             category            => 'Trees',
             service             => 'iOS',
-            lat                 => 55.9,
-            lon                 => -3.2,
+            lat                 => 55.952055,
+            lon                 => -3.189579,
             pc                  => '',
             used_map            => '1',
             submit_register     => '1',
@@ -1580,7 +1580,7 @@ subtest "unresponsive body handling works" => sub {
         # And test per-category refusing
         my $old_email = $contact3->email;
         $contact3->update( { email => 'REFUSED' } );
-        $mech->get_ok('/report/new/category_extras?category=Trees&latitude=51.89&longitude=-2.09');
+        $mech->get_ok('/report/new/category_extras?category=Trees&latitude=51.896268&longitude=-2.093063');
         ok $mech->content_like( qr/Cheltenham.*Trees.*unresponsive.*category=Trees/ );
 
         $mech->get_ok('/around');
@@ -1614,7 +1614,6 @@ subtest "unresponsive body handling works" => sub {
 subtest "unresponsive body page works" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
     }, sub {
         my $old_send = $contact1->body->send_method;
         my $body_id = $contact1->body->id;
@@ -1641,7 +1640,7 @@ subtest "extra google analytics code displayed on logged in problem creation" =>
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
         BASE_URL => 'https://www.fixmystreet.com',
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         # check that the user does not exist
         my $test_email = 'test-2@example.com';
@@ -1670,7 +1669,7 @@ subtest "extra google analytics code displayed on logged in problem creation" =>
         $mech->submit_form_ok(
             {
                 with_fields => {
-                    title         => "Test Report at café", 
+                    title         => "Test Report at café",
                     detail        => 'Test report details.',
                     photo1        => '',
                     name          => 'Joe Bloggs',
@@ -1697,7 +1696,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
         BASE_URL => 'https://www.fixmystreet.com',
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->log_out_ok;
         $mech->clear_emails_ok;
diff --git a/t/app/controller/report_new_mobile.t b/t/app/controller/report_new_mobile.t
index 61cb14a1b..3dfb99b2f 100644
--- a/t/app/controller/report_new_mobile.t
+++ b/t/app/controller/report_new_mobile.t
@@ -1,5 +1,7 @@
 use Test::More;
 use FixMyStreet::TestMech;
+use LWP::Protocol::PSGI;
+use t::Mock::MapItZurich;
 
 my $mech = FixMyStreet::TestMech->new;
 
@@ -7,10 +9,12 @@ my $mech = FixMyStreet::TestMech->new;
 FixMyStreet::App->log->disable('info');
 END { FixMyStreet::App->log->enable('info'); }
 
+LWP::Protocol::PSGI->register(t::Mock::MapItZurich->to_psgi_app, host => 'mapit.zurich');
+
 subtest "Check signed up for alert when logged in" => sub {
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://global.mapit.mysociety.org',
-        MAPIT_TYPES => [ 'O06' ],
+        MAPIT_URL => 'http://mapit.zurich',
+        MAPIT_TYPES => [ 'O08' ],
     }, sub {
         $mech->log_in_ok('user@example.org');
         $mech->post_ok( '/report/new/mobile', {
diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t
index a5b742783..e3a464f88 100644
--- a/t/app/controller/report_new_open311.t
+++ b/t/app/controller/report_new_open311.t
@@ -12,7 +12,7 @@ END { FixMyStreet::App->log->enable('info'); }
 
 my $mech = FixMyStreet::TestMech->new;
 
-my $body = $mech->create_body_ok(2651, 'City of Edinburgh Council');
+my $body = $mech->create_body_ok(2245, 'Wiltshire Council');
 $body->update({
     endpoint => 'http://example.com/open311',
     jurisdiction => 'mySociety',
@@ -27,7 +27,7 @@ my $contact1 = $mech->create_contact_ok(
     extra => [ { description => 'Lamppost number', code => 'number', required => 'True' },
                { description => 'Lamppost type', code => 'type', required => 'False', values =>
                    { value => [ { name => ['Gas'], key => ['old'] }, { name => [ 'Yellow' ], key => [ 'modern' ] } ] }
-               } 
+               }
              ],
 );
 my $contact1b = $mech->create_contact_ok(
@@ -117,7 +117,7 @@ foreach my $test (
         # submit initial pc form
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => { pc => $test->{pc} } },
                 "submit location" );
@@ -158,7 +158,7 @@ foreach my $test (
         };
         FixMyStreet::override_config {
             ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->submit_form_ok( { with_fields => $new_values } );
         };
diff --git a/t/app/controller/reports.t b/t/app/controller/reports.t
index 8fa03897b..a21d3ad65 100644
--- a/t/app/controller/reports.t
+++ b/t/app/controller/reports.t
@@ -107,7 +107,7 @@ is $stats->{'Fife Council'}->[4], 3, 'correct number of fixed reports for Fife';
 is $stats->{'Fife Council'}->[5], 1, 'correct number of older fixed reports for Fife';
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->follow_link_ok( { text_regex => qr/Birmingham/ } );
     $mech->get_ok('/reports/Westminster');
@@ -121,7 +121,7 @@ my $problems = $mech->extract_problem_list;
 is scalar @$problems, 5, 'correct number of problems displayed';
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/reports');
     $mech->follow_link_ok({ url_regex => qr{/reports/Electricity_Gas\+Council} });
@@ -133,7 +133,7 @@ $problems = $mech->extract_problem_list;
 is scalar @$problems, 2, 'correct number of new problems displayed';
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/reports/City+of+Edinburgh?t=older');
 };
@@ -169,7 +169,7 @@ for my $test (
 ) {
     subtest $test->{desc} => sub {
         FixMyStreet::override_config {
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             $mech->get_ok('/reports/Fife+Council?t=' . $test->{type});
         };
@@ -183,7 +183,7 @@ my $private = $westminster_problems[2];
 ok $private->update( { non_public => 1 } ), 'problem marked non public';
 
 FixMyStreet::override_config {
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/reports/Westminster');
 };
@@ -213,7 +213,7 @@ subtest "test fiksgatami all reports page" => sub {
 subtest "test greenwich all reports page" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'greenwich' ],
-        MAPIT_URL => 'http://mapit.mysociety.org/'
+        MAPIT_URL => 'http://mapit.uk/'
     }, sub {
         my $body = $mech->create_body_ok(2493, 'Royal Borough of Greenwich');
         my $deleted_contact = $mech->create_contact_ok(
@@ -235,7 +235,7 @@ subtest "test greenwich all reports page" => sub {
 
 subtest "it lists shortlisted reports" => sub {
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/'
+        MAPIT_URL => 'http://mapit.uk/'
     }, sub {
         my $body = FixMyStreet::App->model('DB::Body')->find( $body_edin_id );
         my $user = $mech->log_in_ok( 'test@example.com' );
diff --git a/t/app/controller/rss.t b/t/app/controller/rss.t
index 4f737dda7..bec504760 100644
--- a/t/app/controller/rss.t
+++ b/t/app/controller/rss.t
@@ -44,7 +44,7 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
 $mech->host('www.fixmystreet.com');
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'fixmystreet' ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok("/rss/pc/EH11BB/2");
 };
@@ -118,7 +118,7 @@ $report->update();
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ 'fixmystreet' ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok("/rss/pc/EH11BB/2");
 };
@@ -186,7 +186,7 @@ subtest "check RSS feeds on cobrand have correct URLs for non-cobrand reports" =
 
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ 'hart' ],
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         $mech->get_ok("/rss/area/Hart");
         my $cobrand = FixMyStreet::Cobrand->get_class_for_moniker('hart')->new();
diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t
index 4e8817225..5e4fcec0a 100644
--- a/t/app/model/alert_type.t
+++ b/t/app/model/alert_type.t
@@ -188,7 +188,7 @@ subtest "correct text for title after URL" => sub {
         }
     )->delete;
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         FixMyStreet::DB->resultset('AlertType')->email_alerts();
     };
@@ -324,7 +324,7 @@ foreach my $test (
         $report->update();
 
         FixMyStreet::override_config {
-            MAPIT_URL => 'http://mapit.mysociety.org/',
+            MAPIT_URL => 'http://mapit.uk/',
         }, sub {
             FixMyStreet::DB->resultset('AlertType')->email_alerts();
         };
@@ -432,7 +432,7 @@ subtest "check alerts from cobrand send main site url for alerts for different c
     )->delete;
 
     FixMyStreet::override_config {
-        MAPIT_URL => 'http://mapit.mysociety.org/',
+        MAPIT_URL => 'http://mapit.uk/',
     }, sub {
         FixMyStreet::DB->resultset('AlertType')->email_alerts();
     };
diff --git a/t/app/model/user.t b/t/app/model/user.t
index bf73a9d09..d4115d586 100644
--- a/t/app/model/user.t
+++ b/t/app/model/user.t
@@ -14,7 +14,7 @@ is $problem->user->latest_anonymity, 0, "User's last report was not anonymous";
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/around?pc=sw1a1aa');
     $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
@@ -32,7 +32,7 @@ is $problem->user->latest_anonymity, 1, "User's last update was anonymous";
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/around?pc=sw1a1aa');
     $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t
index dacf4325a..d6a1c2b34 100644
--- a/t/cobrand/fixamingata.t
+++ b/t/cobrand/fixamingata.t
@@ -1,6 +1,7 @@
 use strict;
 use warnings;
 use Test::More;
+use Test::MockModule;
 
 BEGIN {
     use FixMyStreet;
@@ -12,6 +13,10 @@ use mySociety::Locale;
 use FixMyStreet::TestMech;
 my $mech = FixMyStreet::TestMech->new;
 
+# Closest road reverse geocode mock
+my $resolver = Test::MockModule->new('LWP::Simple');
+$resolver->mock('get', sub($) { "<result></result>" });
+
 # Front page test
 
 ok $mech->host("www.fixamingata.se"), "change host to FixaMinGata";
diff --git a/t/cobrand/form_extras.t b/t/cobrand/form_extras.t
index c6f6976d5..22a86ef21 100644
--- a/t/cobrand/form_extras.t
+++ b/t/cobrand/form_extras.t
@@ -29,7 +29,7 @@ my $mech = FixMyStreet::TestMech->new;
 
 FixMyStreet::override_config {
     ALLOWED_COBRANDS => [ { tester => '.' } ],
-    MAPIT_URL => 'http://mapit.mysociety.org/',
+    MAPIT_URL => 'http://mapit.uk/',
 }, sub {
     $mech->get_ok('/around');
     $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" );
-- 
cgit v1.2.3


From a8ceae6c99b00aefcba301b2f41033d84701f56a Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 23 Mar 2017 18:11:27 +0000
Subject: Fix bug if test run c. 55 hours before BST starts.

The code was adding two days and seven/eight hours to a floating
DateTime, which from 5-7pm on 23rd March 2017 created a DateTime
between 1-2am on 26th March which does not exist in e.g. the UK.
---
 t/app/controller/alert_new.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 729f3a267..ea38f7c25 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -371,7 +371,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
         }
     }
 
-    my $dt = DateTime->now()->add( days => 2);
+    my $dt = DateTime->now(time_zone => 'Europe/London')->add(days => 2);
 
     my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
 
@@ -486,7 +486,7 @@ subtest "Test signature template is used from cobrand" => sub {
 
     my $user2 = $mech->create_user_ok('alerts@example.com', name => 'Alert User' );
 
-    my $dt = DateTime->now()->add( days => 2);
+    my $dt = DateTime->now(time_zone => 'Europe/London')->add(days => 2);
 
     my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
 
-- 
cgit v1.2.3


From b26da0da5e1f8631646a34fdacbce9bb5bc3b706 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 17 Mar 2017 22:18:45 +0000
Subject: Upgrade to using Email::Sender.

Email::Send is long deprecated and uses submodules that no longer work
correctly (e.g. Net::SMTP::TLS breaks with recent IO::Socket::SSL). We
create an Email::Sender subclass to perform the same functionality and
this also simplifies the email code with simpler envelope handling.

Bundle Email::Sender::Transport::SMTP to include fix from
https://github.com/rjbs/Email-Sender/issues/46
---
 conf/general.yml-example                   |   3 +-
 cpanfile                                   |   6 +-
 cpanfile.snapshot                          | 290 ++++++++++++++++------
 perllib/Email/Sender/Transport/SMTP.pm     | 380 +++++++++++++++++++++++++++++
 perllib/FixMyStreet/App.pm                 |  11 +-
 perllib/FixMyStreet/App/Model/EmailSend.pm |  19 --
 perllib/FixMyStreet/Email.pm               |   4 +-
 perllib/FixMyStreet/Email/Sender.pm        |  50 ++++
 perllib/FixMyStreet/EmailSend.pm           |  78 ------
 perllib/FixMyStreet/EmailSend/Variable.pm  |  17 --
 perllib/FixMyStreet/TestMech.pm            |   9 +-
 t/app/helpers/send_email.t                 |   5 +-
 12 files changed, 662 insertions(+), 210 deletions(-)
 create mode 100644 perllib/Email/Sender/Transport/SMTP.pm
 delete mode 100644 perllib/FixMyStreet/App/Model/EmailSend.pm
 create mode 100644 perllib/FixMyStreet/Email/Sender.pm
 delete mode 100644 perllib/FixMyStreet/EmailSend.pm
 delete mode 100644 perllib/FixMyStreet/EmailSend/Variable.pm

diff --git a/conf/general.yml-example b/conf/general.yml-example
index 6c694024d..794b0780b 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -180,7 +180,8 @@ TWITTER_KEY: ''
 TWITTER_SECRET: ''
 
 # If you wish to send email through a SMTP server elsewhere, change these
-# variables. SMTP_TYPE should be one of '', 'ssl' or 'tls'.
+# variables. SMTP_TYPE should be one of '', 'ssl' or 'tls'. SMTP_PORT will
+# default to 587 (tls), 465 (ssl), or 25.
 SMTP_SMARTHOST: 'localhost'
 SMTP_TYPE: ''
 SMTP_PORT: ''
diff --git a/cpanfile b/cpanfile
index c96e05f36..2907f7633 100644
--- a/cpanfile
+++ b/cpanfile
@@ -49,8 +49,7 @@ requires 'DBIx::Class::Schema::Loader';
 requires 'Digest::MD5';
 requires 'Digest::SHA';
 requires 'Email::MIME';
-requires 'Email::Send';
-requires 'Email::Send::SMTP';
+requires 'Email::Sender';
 requires 'Email::Valid';
 requires 'Error';
 requires 'FCGI';
@@ -62,6 +61,7 @@ requires 'Getopt::Long::Descriptive';
 requires 'HTML::Entities';
 requires 'HTTP::Request::Common';
 requires 'Image::Size';
+requires 'IO::Socket::SSL', '2.007';
 requires 'IO::String';
 requires 'JSON::MaybeXS';
 requires 'Locale::gettext';
@@ -76,8 +76,6 @@ requires 'Net::DNS::Resolver';
 requires 'Net::Domain::TLD', '1.75';
 requires 'Net::Facebook::Oauth2';
 requires 'Net::OAuth';
-requires 'Net::SMTP::SSL', '1.03';
-requires 'Net::SMTP::TLS';
 requires 'Net::Twitter::Lite::WithAPIv1_1';
 requires 'Path::Class';
 requires 'POSIX';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index 2c565f8cd..c842dad99 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -214,16 +214,6 @@ DISTRIBUTIONS
       Storable 0
       String::CRC32 0
       Time::HiRes 0
-  Carp-1.26
-    pathname: Z/ZE/ZEFRAM/Carp-1.26.tar.gz
-    provides:
-      Carp 1.26
-      Carp::Heavy 1.26
-    requirements:
-      Exporter 0
-      ExtUtils::MakeMaker 0
-      IPC::Open3 1.0103
-      Test::More 0
   Capture-Tiny-0.40
     pathname: D/DA/DAGOLDEN/Capture-Tiny-0.40.tar.gz
     provides:
@@ -239,6 +229,18 @@ DISTRIBUTIONS
       perl 5.006
       strict 0
       warnings 0
+  Carp-1.26
+    pathname: Z/ZE/ZEFRAM/Carp-1.26.tar.gz
+    provides:
+      Carp 1.26
+      Carp::Heavy 1.26
+    requirements:
+      Exporter 0
+      ExtUtils::MakeMaker 0
+      IPC::Open3 1.0103
+      Test::More 0
+      strict 0
+      warnings 0
   Carp-Assert-0.20
     pathname: M/MS/MSCHWERN/Carp-Assert-0.20.tar.gz
     provides:
@@ -2445,19 +2447,17 @@ DISTRIBUTIONS
       ExtUtils::CBuilder 0.27
       ExtUtils::MakeMaker 0
       perl 5.006
-  Devel-StackTrace-1.30
-    pathname: D/DR/DROLSKY/Devel-StackTrace-1.30.tar.gz
+  Devel-StackTrace-2.02
+    pathname: D/DR/DROLSKY/Devel-StackTrace-2.02.tar.gz
     provides:
-      Devel::StackTrace 1.30
-      Devel::StackTrace::Frame 1.30
+      Devel::StackTrace 2.02
+      Devel::StackTrace::Frame 2.02
     requirements:
-      ExtUtils::MakeMaker 6.30
+      ExtUtils::MakeMaker 0
       File::Spec 0
       Scalar::Util 0
-      Test::More 0.88
-      base 0
-      bytes 0
       overload 0
+      perl 5.006
       strict 0
       warnings 0
   Devel-StackTrace-AsHTML-0.14
@@ -2510,6 +2510,26 @@ DISTRIBUTIONS
       base 0
       strict 0
       warnings 0
+  Email-Abstract-3.008
+    pathname: R/RJ/RJBS/Email-Abstract-3.008.tar.gz
+    provides:
+      Email::Abstract 3.008
+      Email::Abstract::EmailMIME 3.008
+      Email::Abstract::EmailSimple 3.008
+      Email::Abstract::MIMEEntity 3.008
+      Email::Abstract::MailInternet 3.008
+      Email::Abstract::MailMessage 3.008
+      Email::Abstract::Plugin 3.008
+    requirements:
+      Carp 0
+      Email::Simple 1.998
+      ExtUtils::MakeMaker 0
+      MRO::Compat 0
+      Module::Pluggable 1.5
+      Scalar::Util 0
+      perl 5.006
+      strict 0
+      warnings 0
   Email-Address-1.898
     pathname: R/RJ/RJBS/Email-Address-1.898.tar.gz
     provides:
@@ -2582,25 +2602,61 @@ DISTRIBUTIONS
       overload 0
       strict 0
       warnings 0
-  Email-Send-2.198
-    pathname: R/RJ/RJBS/Email-Send-2.198.tar.gz
-    provides:
-      Email::Send 2.198
-      Email::Send::NNTP 2.198
-      Email::Send::Qmail 2.198
-      Email::Send::SMTP 2.198
-      Email::Send::Sendmail 2.198
-      Email::Send::Test 2.198
+  Email-Sender-1.300030
+    pathname: R/RJ/RJBS/Email-Sender-1.300030.tar.gz
+    provides:
+      Email::Sender 1.300030
+      Email::Sender::Failure 1.300030
+      Email::Sender::Failure::Multi 1.300030
+      Email::Sender::Failure::Permanent 1.300030
+      Email::Sender::Failure::Temporary 1.300030
+      Email::Sender::Manual 1.300030
+      Email::Sender::Manual::QuickStart 1.300030
+      Email::Sender::Role::CommonSending 1.300030
+      Email::Sender::Role::HasMessage 1.300030
+      Email::Sender::Simple 1.300030
+      Email::Sender::Success 1.300030
+      Email::Sender::Success::Partial 1.300030
+      Email::Sender::Transport 1.300030
+      Email::Sender::Transport::DevNull 1.300030
+      Email::Sender::Transport::Failable 1.300030
+      Email::Sender::Transport::Maildir 1.300030
+      Email::Sender::Transport::Mbox 1.300030
+      Email::Sender::Transport::Print 1.300030
+      Email::Sender::Transport::SMTP 1.300030
+      Email::Sender::Transport::SMTP::Persistent 1.300030
+      Email::Sender::Transport::Sendmail 1.300030
+      Email::Sender::Transport::Test 1.300030
+      Email::Sender::Transport::Wrapper 1.300030
+      Email::Sender::Util 1.300030
     requirements:
-      Email::Address 1.80
-      Email::Simple 1.92
+      Carp 0
+      Email::Abstract 3.006
+      Email::Address 0
+      Email::Simple 1.998
       ExtUtils::MakeMaker 0
+      Fcntl 0
+      File::Basename 0
+      File::Path 2.06
       File::Spec 0
-      Module::Pluggable 2.97
-      Return::Value 1.28
-      Scalar::Util 1.02
-      Symbol 0
-      Test::More 0.47
+      IO::File 1.11
+      IO::Handle 0
+      List::Util 1.45
+      Module::Runtime 0
+      Moo 2.000000
+      Moo::Role 0
+      MooX::Types::MooseLike 0.15
+      MooX::Types::MooseLike::Base 0
+      Net::SMTP 3.07
+      Scalar::Util 0
+      Sub::Exporter 0
+      Sub::Exporter::Util 0
+      Sys::Hostname 0
+      Throwable::Error 0.200003
+      Try::Tiny 0
+      strict 0
+      utf8 0
+      warnings 0
   Email-Simple-2.102
     pathname: R/RJ/RJBS/Email-Simple-2.102.tar.gz
     provides:
@@ -3262,16 +3318,21 @@ DISTRIBUTIONS
       File::Temp 0
       Scalar::Util 0
       Test::More 0.88
-  IO-Socket-SSL-1.84
-    pathname: S/SU/SULLR/IO-Socket-SSL-1.84.tar.gz
+  IO-Socket-SSL-2.047
+    pathname: S/SU/SULLR/IO-Socket-SSL-2.047.tar.gz
     provides:
-      IO::Socket::SSL 1.84
-      IO::Socket::SSL::SSL_Context 1.84
-      IO::Socket::SSL::SSL_HANDLE 1.84
-      IO::Socket::SSL::Session_Cache 1.84
+      IO::Socket::SSL 2.047
+      IO::Socket::SSL::Intercept 2.014
+      IO::Socket::SSL::OCSP_Cache 2.047
+      IO::Socket::SSL::OCSP_Resolver 2.047
+      IO::Socket::SSL::PublicSuffix undef
+      IO::Socket::SSL::SSL_Context 2.047
+      IO::Socket::SSL::SSL_HANDLE 2.047
+      IO::Socket::SSL::Session_Cache 2.047
+      IO::Socket::SSL::Utils 2.014
     requirements:
       ExtUtils::MakeMaker 0
-      Net::SSLeay 1.21
+      Net::SSLeay 1.46
       Scalar::Util 0
   IO-String-1.08
     pathname: G/GA/GAAS/IO-String-1.08.tar.gz
@@ -3847,34 +3908,36 @@ DISTRIBUTIONS
       Test::More 0
       perl 5.008001
       version 0
-  Moo-1.003000
-    pathname: H/HA/HAARG/Moo-1.003000.tar.gz
+  Moo-2.003001
+    pathname: H/HA/HAARG/Moo-2.003001.tar.gz
     provides:
       Method::Generate::Accessor undef
       Method::Generate::BuildAll undef
       Method::Generate::Constructor undef
       Method::Generate::DemolishAll undef
-      Method::Inliner undef
-      Moo 1.003000
+      Moo 2.003001
       Moo::HandleMoose undef
       Moo::HandleMoose::FakeConstructor undef
       Moo::HandleMoose::FakeMetaClass undef
+      Moo::HandleMoose::_TypeMap undef
       Moo::Object undef
-      Moo::Role undef
+      Moo::Role 2.003001
       Moo::_Utils undef
       Moo::_mro undef
+      Moo::_strictures undef
       Moo::sification undef
-      Sub::Defer undef
-      Sub::Quote undef
       oo undef
     requirements:
       Class::Method::Modifiers 1.1
       Devel::GlobalDestruction 0.11
-      Dist::CheckConflicts 0.02
+      Exporter 5.57
       ExtUtils::MakeMaker 0
-      Module::Runtime 0.012
-      Role::Tiny 1.003
-      strictures 1.004003
+      Module::Runtime 0.014
+      Role::Tiny 2.000004
+      Scalar::Util 0
+      Sub::Defer 2.003001
+      Sub::Quote 2.003001
+      perl 5.006
   MooX-Types-MooseLike-0.29
     pathname: M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz
     provides:
@@ -4379,27 +4442,6 @@ DISTRIBUTIONS
       Test::More 0.66
       Test::Warn 0.21
       URI::Escape 3.28
-  Net-SMTP-SSL-1.03
-    pathname: R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz
-    provides:
-      Net::SMTP::SSL 1.03
-    requirements:
-      ExtUtils::MakeMaker 0
-      IO::Socket::SSL 0
-      Net::SMTP 0
-      Test::More 0.47
-  Net-SMTP-TLS-0.12
-    pathname: A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz
-    provides:
-      Net::SMTP::TLS 0.12
-    requirements:
-      Digest::HMAC_MD5 0
-      ExtUtils::MakeMaker 0
-      IO::Socket::INET 0
-      IO::Socket::SSL 0
-      MIME::Base64 0
-      Net::SSLeay 0
-      Test::More 0
   Net-SSLeay-1.52
     pathname: M/MI/MIKEM/Net-SSLeay-1.52.tar.gz
     provides:
@@ -4901,15 +4943,14 @@ DISTRIBUTIONS
     requirements:
       ExtUtils::MakeMaker 0
       Test::More 0.47
-  Role-Tiny-1.003001
-    pathname: H/HA/HAARG/Role-Tiny-1.003001.tar.gz
+  Role-Tiny-2.000005
+    pathname: H/HA/HAARG/Role-Tiny-2.000005.tar.gz
     provides:
-      Role::Tiny 1.003001
-      Role::Tiny::With undef
+      Role::Tiny 2.000005
+      Role::Tiny::With 2.000005
     requirements:
-      ExtUtils::MakeMaker 0
-      Test::Fatal 0.003
-      Test::More 0.96
+      Exporter 5.57
+      perl 5.006
   SOAP-Lite-0.715
     pathname: M/MK/MKUTTER/SOAP-Lite-0.715.tar.gz
     provides:
@@ -5064,6 +5105,17 @@ DISTRIBUTIONS
       Safe::Isa 1.000002
     requirements:
       ExtUtils::MakeMaker 0
+  Scalar-List-Utils-1.47
+    pathname: P/PE/PEVANS/Scalar-List-Utils-1.47.tar.gz
+    provides:
+      List::Util 1.47
+      List::Util::XS 1.47
+      Scalar::Util 1.47
+      Sub::Util 1.47
+    requirements:
+      ExtUtils::MakeMaker 0
+      Test::More 0
+      perl 5.006
   Scope-Guard-0.20
     pathname: C/CH/CHOCOLATE/Scope-Guard-0.20.tar.gz
     provides:
@@ -5084,6 +5136,15 @@ DISTRIBUTIONS
       Lingua::Stem::Snowball::Se 1.2
     requirements:
       Test::More 0.42
+  Socket-2.024
+    pathname: P/PE/PEVANS/Socket-2.024.tar.gz
+    provides:
+      Socket 2.024
+    requirements:
+      ExtUtils::CBuilder 0
+      ExtUtils::Constant 0.23
+      ExtUtils::MakeMaker 0
+      perl 5.006001
   Sort-Key-1.32
     pathname: S/SA/SALVA/Sort-Key-1.32.tar.gz
     provides:
@@ -5230,6 +5291,15 @@ DISTRIBUTIONS
       ExtUtils::MakeMaker 0
       Test::Fatal 0.010
       Test::More 0.47
+  Sub-Quote-2.003001
+    pathname: H/HA/HAARG/Sub-Quote-2.003001.tar.gz
+    provides:
+      Sub::Defer 2.003001
+      Sub::Quote 2.003001
+    requirements:
+      ExtUtils::MakeMaker 0
+      Scalar::Util 0
+      perl 5.006
   Sub-Uplevel-0.24
     pathname: D/DA/DAGOLDEN/Sub-Uplevel-0.24.tar.gz
     provides:
@@ -5827,6 +5897,22 @@ DISTRIBUTIONS
       Text::Unidecode 0.04
     requirements:
       ExtUtils::MakeMaker 0
+  Throwable-0.200013
+    pathname: R/RJ/RJBS/Throwable-0.200013.tar.gz
+    provides:
+      StackTrace::Auto 0.200013
+      Throwable 0.200013
+      Throwable::Error 0.200013
+    requirements:
+      Carp 0
+      Devel::StackTrace 1.32
+      ExtUtils::MakeMaker 0
+      Module::Runtime 0.002
+      Moo 1.000001
+      Moo::Role 0
+      Scalar::Util 0
+      Sub::Quote 0
+      overload 0
   Tie-IxHash-1.23
     pathname: C/CH/CHORNY/Tie-IxHash-1.23.tar.gz
     provides:
@@ -6357,6 +6443,50 @@ DISTRIBUTIONS
       Locale::gettext 1.05
     requirements:
       ExtUtils::MakeMaker 0
+  libnet-3.10
+    pathname: S/SH/SHAY/libnet-3.10.tar.gz
+    provides:
+      Net undef
+      Net::Cmd 3.10
+      Net::Config 3.10
+      Net::Domain 3.10
+      Net::FTP 3.10
+      Net::FTP::A 3.10
+      Net::FTP::E 3.10
+      Net::FTP::I 3.10
+      Net::FTP::L 3.10
+      Net::FTP::_SSL_SingleSessionCache 3.10
+      Net::FTP::dataconn 3.10
+      Net::NNTP 3.10
+      Net::NNTP::_SSL 3.10
+      Net::Netrc 3.10
+      Net::POP3 3.10
+      Net::POP3::_SSL 3.10
+      Net::SMTP 3.10
+      Net::SMTP::_SSL 3.10
+      Net::Time 3.10
+    requirements:
+      Carp 0
+      Errno 0
+      Exporter 0
+      ExtUtils::MakeMaker 6.64
+      Fcntl 0
+      File::Basename 0
+      FileHandle 0
+      Getopt::Std 0
+      IO::File 0
+      IO::Select 0
+      IO::Socket 1.05
+      POSIX 0
+      Socket 2.016
+      Symbol 0
+      Time::Local 0
+      constant 0
+      perl 5.008001
+      strict 0
+      utf8 0
+      vars 0
+      warnings 0
   libwww-perl-6.05
     pathname: G/GA/GAAS/libwww-perl-6.05.tar.gz
     provides:
diff --git a/perllib/Email/Sender/Transport/SMTP.pm b/perllib/Email/Sender/Transport/SMTP.pm
new file mode 100644
index 000000000..c4eb6890c
--- /dev/null
+++ b/perllib/Email/Sender/Transport/SMTP.pm
@@ -0,0 +1,380 @@
+package Email::Sender::Transport::SMTP;
+# ABSTRACT: send email over SMTP
+$Email::Sender::Transport::SMTP::VERSION = '1.300030';
+use Moo;
+
+use Email::Sender::Failure::Multi;
+use Email::Sender::Success::Partial;
+use Email::Sender::Role::HasMessage ();
+use Email::Sender::Util;
+use MooX::Types::MooseLike::Base qw(Bool Int Str HashRef);
+use Net::SMTP 3.07; # SSL support, fixed datasend
+
+use utf8 (); # See below. -- rjbs, 2015-05-14
+use version ();
+
+#pod =head1 DESCRIPTION
+#pod
+#pod This transport is used to send email over SMTP, either with or without secure
+#pod sockets (SSL/TLS).  It is one of the most complex transports available, capable
+#pod of partial success.
+#pod
+#pod For a potentially more efficient version of this transport, see
+#pod L<Email::Sender::Transport::SMTP::Persistent>.
+#pod
+#pod =head1 ATTRIBUTES
+#pod
+#pod The following attributes may be passed to the constructor:
+#pod
+#pod =over 4
+#pod
+#pod =item C<host>: the name of the host to connect to; defaults to C<localhost>
+#pod
+#pod =item C<ssl>: if 'starttls', use STARTTLS; if 'ssl' (or 1), connect securely;
+#pod otherwise, no security
+#pod
+#pod =item C<ssl_options>: passed to Net::SMTP constructor for 'ssl' connections or
+#pod to starttls for 'starttls' connections; should contain extra options for
+#pod IO::Socket::SSL
+#pod
+#pod =item C<port>: port to connect to; defaults to 25 for non-SSL, 465 for 'ssl',
+#pod 587 for 'starttls'
+#pod
+#pod =item C<timeout>: maximum time in secs to wait for server; default is 120
+#pod
+#pod =cut
+
+sub BUILD {
+  my ($self) = @_;
+  Carp::croak("do not pass port number to SMTP transport in host, use port parameter")
+    if $self->host =~ /:/;
+}
+
+has host => (is => 'ro', isa => Str, default => sub { 'localhost' });
+has ssl  => (is => 'ro', isa => Str, default => sub { 0 });
+
+has _security => (
+  is   => 'ro',
+  lazy => 1,
+  init_arg => undef,
+  default  => sub {
+    my $ssl = $_[0]->ssl;
+    return '' unless $ssl;
+    $ssl = lc $ssl;
+    return 'starttls' if 'starttls' eq $ssl;
+    return 'ssl' if $ssl eq 1 or $ssl eq 'ssl';
+
+    Carp::cluck(qq{true "ssl" argument to Email::Sender::Transport::SMTP should be 'ssl' or 'startls' or '1' but got '$ssl'});
+
+    return 1;
+  },
+);
+
+has ssl_options => (is => 'ro', isa => HashRef, default => sub {  {}  });
+
+has port => (
+  is  => 'ro',
+  isa => Int,
+  lazy    => 1,
+  default => sub {
+    return $_[0]->_security eq 'starttls' ? 587
+         : $_[0]->_security eq 'ssl'      ? 465
+         :                                   25
+  },
+);
+
+has timeout => (is => 'ro', isa => Int, default => sub { 120 });
+
+#pod =item C<sasl_username>: the username to use for auth; optional
+#pod
+#pod =item C<sasl_password>: the password to use for auth; required if C<username> is provided
+#pod
+#pod =item C<allow_partial_success>: if true, will send data even if some recipients were rejected; defaults to false
+#pod
+#pod =cut
+
+has sasl_username => (is => 'ro', isa => Str);
+has sasl_password => (is => 'ro', isa => Str);
+
+has allow_partial_success => (is => 'ro', isa => Bool, default => sub { 0 });
+
+#pod =item C<helo>: what to say when saying HELO; no default
+#pod
+#pod =item C<localaddr>: local address from which to connect
+#pod
+#pod =item C<localport>: local port from which to connect
+#pod
+#pod =cut
+
+has helo      => (is => 'ro', isa => Str);
+has localaddr => (is => 'ro');
+has localport => (is => 'ro', isa => Int);
+
+#pod =item C<debug>: if true, put the L<Net::SMTP> object in debug mode
+#pod
+#pod =back
+#pod
+#pod =cut
+
+has debug => (is => 'ro', isa => Bool, default => sub { 0 });
+
+# I am basically -sure- that this is wrong, but sending hundreds of millions of
+# messages has shown that it is right enough.  I will try to make it textbook
+# later. -- rjbs, 2008-12-05
+sub _quoteaddr {
+  my $addr       = shift;
+  my @localparts = split /\@/, $addr;
+  my $domain     = pop @localparts;
+  my $localpart  = join q{@}, @localparts;
+
+  return $addr # The first regex here is RFC 821 "specials" excepting dot.
+    unless $localpart =~ /[\x00-\x1F\x7F<>\(\)\[\]\\,;:@"]/
+    or     $localpart =~ /^\./
+    or     $localpart =~ /\.$/;
+  return join q{@}, qq("$localpart"), $domain;
+}
+
+sub _smtp_client {
+  my ($self) = @_;
+
+  my $class = "Net::SMTP";
+
+  my $smtp = $class->new( $self->_net_smtp_args );
+
+  unless ($smtp) {
+    $self->_throw(
+      sprintf "unable to establish SMTP connection to %s port %s",
+        $self->host,
+        $self->port,
+    );
+  }
+
+  if ($self->_security eq 'starttls') {
+    $self->_throw("can't STARTTLS: " . $smtp->message)
+      unless $smtp->starttls(%{ $self->ssl_options });
+  }
+
+  if ($self->sasl_username) {
+    $self->_throw("sasl_username but no sasl_password")
+      unless defined $self->sasl_password;
+
+    unless ($smtp->auth($self->sasl_username, $self->sasl_password)) {
+      if ($smtp->message =~ /MIME::Base64|Authen::SASL/) {
+        Carp::confess("SMTP auth requires MIME::Base64 and Authen::SASL");
+      }
+
+      $self->_throw('failed AUTH', $smtp);
+    }
+  }
+
+  return $smtp;
+}
+
+sub _net_smtp_args {
+  my ($self) = @_;
+
+  return (
+    $self->host,
+    Port    => $self->port,
+    Timeout => $self->timeout,
+    Debug   => $self->debug,
+
+    (($self->_security eq 'ssl')
+      ? (SSL => 1, %{ $self->ssl_options })
+      : ()),
+
+    defined $self->helo      ? (Hello     => $self->helo)      : (),
+    defined $self->localaddr ? (LocalAddr => $self->localaddr) : (),
+    defined $self->localport ? (LocalPort => $self->localport) : (),
+  );
+}
+
+sub _throw {
+  my ($self, @rest) = @_;
+  Email::Sender::Util->_failure(@rest)->throw;
+}
+
+sub send_email {
+  my ($self, $email, $env) = @_;
+
+  Email::Sender::Failure->throw("no valid addresses in recipient list")
+    unless my @to = grep { defined and length } @{ $env->{to} };
+
+  my $smtp = $self->_smtp_client;
+
+  my $FAULT = sub { $self->_throw($_[0], $smtp); };
+
+  $smtp->mail(_quoteaddr($env->{from}))
+    or $FAULT->("$env->{from} failed after MAIL FROM");
+
+  my @failures;
+  my @ok_rcpts;
+
+  for my $addr (@to) {
+    if ($smtp->to(_quoteaddr($addr))) {
+      push @ok_rcpts, $addr;
+    } else {
+      # my ($self, $error, $smtp, $error_class, @rest) = @_;
+      push @failures, Email::Sender::Util->_failure(
+        undef,
+        $smtp,
+        recipients => [ $addr ],
+      );
+    }
+  }
+
+  # This logic used to include: or (@ok_rcpts == 1 and $ok_rcpts[0] eq '0')
+  # because if called without SkipBad, $smtp->to can return 1 or 0.  This
+  # should not happen because we now always pass SkipBad and do the counting
+  # ourselves.  Still, I've put this comment here (a) in memory of the
+  # suffering it caused to have to find that problem and (b) in case the
+  # original problem is more insidious than I thought! -- rjbs, 2008-12-05
+
+  if (
+    @failures
+    and ((@ok_rcpts == 0) or (! $self->allow_partial_success))
+  ) {
+    $failures[0]->throw if @failures == 1;
+
+    my $message = sprintf '%s recipients were rejected during RCPT',
+      @ok_rcpts ? 'some' : 'all';
+
+    Email::Sender::Failure::Multi->throw(
+      message  => $message,
+      failures => \@failures,
+    );
+  }
+
+  # restore Pobox's support for streaming, code-based messages, and arrays here
+  # -- rjbs, 2008-12-04
+
+  $smtp->data                        or $FAULT->("error at DATA start");
+
+  my $msg_string = $email->as_string;
+  my $hunk_size  = $self->_hunk_size;
+
+  while (length $msg_string) {
+    my $next_hunk = substr $msg_string, 0, $hunk_size, '';
+    $smtp->datasend($next_hunk) or $FAULT->("error at during DATA");
+  }
+
+  $smtp->dataend                     or $FAULT->("error at after DATA");
+
+  my $message = $smtp->message;
+
+  $self->_message_complete($smtp);
+
+  # We must report partial success (failures) if applicable.
+  return $self->success({ message => $message }) unless @failures;
+  return $self->partial_success({
+    message => $message,
+    failure => Email::Sender::Failure::Multi->new({
+      message  => 'some recipients were rejected during RCPT',
+      failures => \@failures
+    }),
+  });
+}
+
+sub _hunk_size { 2**20 } # send messages to DATA in hunks of 1 mebibyte
+
+sub success {
+  my $self = shift;
+  my $success = Moo::Role->create_class_with_roles('Email::Sender::Success', 'Email::Sender::Role::HasMessage')->new(@_);
+}
+
+sub partial_success {
+  my $self = shift;
+  my $partial_success = Moo::Role->create_class_with_roles('Email::Sender::Success::Partial', 'Email::Sender::Role::HasMessage')->new(@_);
+}
+
+sub _message_complete { $_[1]->quit; }
+
+#pod =head1 PARTIAL SUCCESS
+#pod
+#pod If C<allow_partial_success> was set when creating the transport, the transport
+#pod may return L<Email::Sender::Success::Partial> objects.  Consult that module's
+#pod documentation.
+#pod
+#pod =cut
+
+with 'Email::Sender::Transport';
+no Moo;
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Email::Sender::Transport::SMTP - send email over SMTP
+
+=head1 VERSION
+
+version 1.300030
+
+=head1 DESCRIPTION
+
+This transport is used to send email over SMTP, either with or without secure
+sockets (SSL/TLS).  It is one of the most complex transports available, capable
+of partial success.
+
+For a potentially more efficient version of this transport, see
+L<Email::Sender::Transport::SMTP::Persistent>.
+
+=head1 ATTRIBUTES
+
+The following attributes may be passed to the constructor:
+
+=over 4
+
+=item C<host>: the name of the host to connect to; defaults to C<localhost>
+
+=item C<ssl>: if 'starttls', use STARTTLS; if 'ssl' (or 1), connect securely;
+otherwise, no security
+
+=item C<ssl_options>: passed to Net::SMTP constructor for 'ssl' connections or
+to starttls for 'starttls' connections; should contain extra options for
+IO::Socket::SSL
+
+=item C<port>: port to connect to; defaults to 25 for non-SSL, 465 for 'ssl',
+587 for 'starttls'
+
+=item C<timeout>: maximum time in secs to wait for server; default is 120
+
+=item C<sasl_username>: the username to use for auth; optional
+
+=item C<sasl_password>: the password to use for auth; required if C<username> is provided
+
+=item C<allow_partial_success>: if true, will send data even if some recipients were rejected; defaults to false
+
+=item C<helo>: what to say when saying HELO; no default
+
+=item C<localaddr>: local address from which to connect
+
+=item C<localport>: local port from which to connect
+
+=item C<debug>: if true, put the L<Net::SMTP> object in debug mode
+
+=back
+
+=head1 PARTIAL SUCCESS
+
+If C<allow_partial_success> was set when creating the transport, the transport
+may return L<Email::Sender::Success::Partial> objects.  Consult that module's
+documentation.
+
+=head1 AUTHOR
+
+Ricardo Signes <rjbs@cpan.org>
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2016 by Ricardo Signes.
+
+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.pm b/perllib/FixMyStreet/App.pm
index 9660d327a..35e8c2537 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -9,9 +9,11 @@ use FixMyStreet::Cobrand;
 use Memcached;
 use FixMyStreet::Map;
 use FixMyStreet::Email;
+use FixMyStreet::Email::Sender;
 use Utils;
 
 use Path::Tiny 'path';
+use Try::Tiny;
 use URI;
 use URI::QueryParam;
 
@@ -346,8 +348,13 @@ sub send_email {
     $data->{_html_images_} = \@inline_images if @inline_images;
 
     my $email = mySociety::Locale::in_gb_locale { FixMyStreet::Email::construct_email($data) };
-    my $return = $c->model('EmailSend')->send($email);
-    $c->log->error("$return") if !$return;
+
+    try {
+        FixMyStreet::Email::Sender->send($email, { from => $sender });
+    } catch {
+        my $error = $_ || 'unknown error';
+        $c->log->error("$error");
+    };
 
     return $email;
 }
diff --git a/perllib/FixMyStreet/App/Model/EmailSend.pm b/perllib/FixMyStreet/App/Model/EmailSend.pm
deleted file mode 100644
index 93751d4a6..000000000
--- a/perllib/FixMyStreet/App/Model/EmailSend.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-package FixMyStreet::App::Model::EmailSend;
-use base 'Catalyst::Model::Factory';
-
-use strict;
-use warnings;
-
-=head1 NAME
-
-FixMyStreet::App::Model::EmailSend
-
-=head1 DESCRIPTION
-
-Catalyst Model wrapper around FixMyStreet::EmailSend
-
-=cut
-
-__PACKAGE__->config(
-    class => 'FixMyStreet::EmailSend',
-);
diff --git a/perllib/FixMyStreet/Email.pm b/perllib/FixMyStreet/Email.pm
index e0d82a8ef..ea84e3966 100644
--- a/perllib/FixMyStreet/Email.pm
+++ b/perllib/FixMyStreet/Email.pm
@@ -17,7 +17,7 @@ use mySociety::Random qw(random_bytes);
 use Utils::Email;
 use FixMyStreet;
 use FixMyStreet::DB;
-use FixMyStreet::EmailSend;
+use FixMyStreet::Email::Sender;
 
 sub test_dmarc {
     my $email = shift;
@@ -187,7 +187,7 @@ sub send_cron {
         print $email->as_string;
         return 1; # Failure
     } else {
-        my $result = FixMyStreet::EmailSend->new({ env_from => $env_from })->send($email);
+        my $result = FixMyStreet::Email::Sender->try_to_send($email, { from => $env_from });
         return $result ? 0 : 1;
     }
 }
diff --git a/perllib/FixMyStreet/Email/Sender.pm b/perllib/FixMyStreet/Email/Sender.pm
new file mode 100644
index 000000000..e6148a56c
--- /dev/null
+++ b/perllib/FixMyStreet/Email/Sender.pm
@@ -0,0 +1,50 @@
+package FixMyStreet::Email::Sender;
+
+use parent Email::Sender::Simple;
+use strict;
+use warnings;
+
+use Email::Sender::Util;
+use FixMyStreet;
+
+=head1 NAME
+
+FixMyStreet::Email::Sender
+
+=head1 DESCRIPTION
+
+Subclass of Email::Sender - configuring it correctly according to our config.
+
+If the config value 'SMTP_SMARTHOST' is set then email is routed via SMTP to
+that. Otherwise it is sent using a 'sendmail' like binary on the local system.
+
+And finally if if FixMyStreet->test_mode returns true then emails are not sent
+at all but are stored in memory for the test suite to inspect (using
+Email::Send::Test).
+
+=cut
+
+sub build_default_transport {
+    if ( FixMyStreet->test_mode ) {
+        Email::Sender::Util->easy_transport(Test => {});
+    } elsif ( my $smtp_host = FixMyStreet->config('SMTP_SMARTHOST') ) {
+        my $type = FixMyStreet->config('SMTP_TYPE') || '';
+        my $port = FixMyStreet->config('SMTP_PORT') || '';
+        my $username = FixMyStreet->config('SMTP_USERNAME') || '';
+        my $password = FixMyStreet->config('SMTP_PASSWORD') || '';
+
+        my $ssl = $type eq 'tls' ? 'starttls' : $type eq 'ssl' ? 'ssl' : '';
+        my $args = {
+            host => $smtp_host,
+            ssl => $ssl,
+            sasl_username => $username,
+            sasl_password => $password,
+        };
+        $args->{port} = $port if $port;
+        Email::Sender::Util->easy_transport(SMTP => $args);
+    } else {
+        Email::Sender::Util->easy_transport(Sendmail => {});
+    }
+}
+
+1;
diff --git a/perllib/FixMyStreet/EmailSend.pm b/perllib/FixMyStreet/EmailSend.pm
deleted file mode 100644
index 09f434931..000000000
--- a/perllib/FixMyStreet/EmailSend.pm
+++ /dev/null
@@ -1,78 +0,0 @@
-package FixMyStreet::EmailSend;
-
-use strict;
-use warnings;
-
-BEGIN {
-    # Should move away from Email::Send, but until then:
-    $Return::Value::NO_CLUCK = 1;
-}
-
-use FixMyStreet;
-use Email::Send;
-
-=head1 NAME
-
-FixMyStreet::EmailSend
-
-=head1 DESCRIPTION
-
-Thin wrapper around Email::Send - configuring it correctly according to our config.
-
-If the config value 'SMTP_SMARTHOST' is set then email is routed via SMTP to
-that. Otherwise it is sent using a 'sendmail' like binary on the local system.
-
-And finally if if FixMyStreet->test_mode returns true then emails are not sent
-at all but are stored in memory for the test suite to inspect (using
-Email::Send::Test).
-
-=cut
-
-my $args = undef;
-
-if ( FixMyStreet->test_mode ) {
-    # Email::Send::Test
-    $args = { mailer => 'Test', };
-} elsif ( my $smtp_host = FixMyStreet->config('SMTP_SMARTHOST') ) {
-    # Email::Send::SMTP
-    my $type = FixMyStreet->config('SMTP_TYPE') || '';
-    my $port = FixMyStreet->config('SMTP_PORT') || '';
-    my $username = FixMyStreet->config('SMTP_USERNAME') || '';
-    my $password = FixMyStreet->config('SMTP_PASSWORD') || '';
-
-    unless ($port) {
-        $port = 25;
-        $port = 465 if $type eq 'ssl';
-        $port = 587 if $type eq 'tls';
-    }
-
-    my $mailer_args = [
-        Host => $smtp_host,
-        Port => $port,
-    ];
-    push @$mailer_args, ssl => 1 if $type eq 'ssl';
-    push @$mailer_args, tls => 1 if $type eq 'tls';
-    push @$mailer_args, username => $username, password => $password
-        if $username && $password;
-    $args = {
-        mailer      => 'FixMyStreet::EmailSend::Variable',
-        mailer_args => $mailer_args,
-    };
-} else {
-    # Email::Send::Sendmail
-    $args = { mailer => 'Sendmail' };
-}
-
-sub new {
-    my ($cls, $hash) = @_;
-    $hash ||= {};
-    my %args = ( %$args, %$hash );
-
-    my $sender = delete($args{env_from});
-    if ($sender) {
-        $args{mailer_args} = [ @{$args{mailer_args}} ] if $args{mailer_args};
-        push @{$args{mailer_args}}, env_from => $sender;
-    }
-
-    return Email::Send->new(\%args);
-}
diff --git a/perllib/FixMyStreet/EmailSend/Variable.pm b/perllib/FixMyStreet/EmailSend/Variable.pm
deleted file mode 100644
index 4ba56dd41..000000000
--- a/perllib/FixMyStreet/EmailSend/Variable.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package FixMyStreet::EmailSend::Variable;
-use base Email::Send::SMTP;
-use FixMyStreet;
-
-my $sender;
-
-sub send {
-    my ($class, $message, %args) = @_;
-    $sender = delete($args{env_from}) || FixMyStreet->config('DO_NOT_REPLY_EMAIL');
-    $class->SUPER::send($message, %args);
-}
-
-sub get_env_sender {
-    $sender;
-}
-
-1;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 122a5d0c9..c22789fb0 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -13,7 +13,7 @@ use Test::WWW::Mechanize::Catalyst 'FixMyStreet::App';
 use Test::More;
 use Web::Scraper;
 use Carp;
-use Email::Send::Test;
+use FixMyStreet::Email::Sender;
 use JSON::MaybeXS;
 
 =head1 NAME
@@ -182,7 +182,7 @@ Clear the email queue.
 
 sub clear_emails_ok {
     my $mech = shift;
-    Email::Send::Test->clear;
+    FixMyStreet::Email::Sender->default_transport->clear_deliveries;
     $mech->builder->ok( 1, 'cleared email queue' );
     return 1;
 }
@@ -199,7 +199,7 @@ sub email_count_is {
     my $mech = shift;
     my $number = shift || 0;
 
-    $mech->builder->is_num( scalar( Email::Send::Test->emails ),
+    $mech->builder->is_num( scalar( FixMyStreet::Email::Sender->default_transport->delivery_count ),
         $number, "checking for $number email(s) in the queue" );
 }
 
@@ -215,7 +215,8 @@ In list context returns all the emails (or none).
 
 sub get_email {
     my $mech   = shift;
-    my @emails = Email::Send::Test->emails;
+    my @emails = FixMyStreet::Email::Sender->default_transport->deliveries;
+    @emails = map { $_->{email}->object } @emails;
 
     return @emails if wantarray;
 
diff --git a/t/app/helpers/send_email.t b/t/app/helpers/send_email.t
index 3975002fa..66b771292 100644
--- a/t/app/helpers/send_email.t
+++ b/t/app/helpers/send_email.t
@@ -19,7 +19,6 @@ use Test::LongString;
 
 use Catalyst::Test 'FixMyStreet::App';
 
-use Email::Send::Test;
 use Path::Tiny;
 
 use FixMyStreet::TestMech;
@@ -31,7 +30,7 @@ my $c = ctx_request("/");
 $c->stash->{foo} = 'bar';
 
 # clear the email queue
-Email::Send::Test->clear;
+$mech->clear_emails_ok;
 
 # send the test email
 FixMyStreet::override_config {
@@ -42,7 +41,7 @@ FixMyStreet::override_config {
 };
 
 # check it got templated and sent correctly
-my @emails = Email::Send::Test->emails;
+my @emails = $mech->get_email;
 is scalar(@emails), 1, "caught one email";
 
 # Get the email, check it has a date and then strip it out
-- 
cgit v1.2.3


From e0aa3679836cd235768161e72d51a1557bead85f Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Tue, 28 Mar 2017 14:48:35 +0100
Subject: Bring changelog up to date.

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 657629f00..fc1288066 100644
--- a/README.md
+++ b/README.md
@@ -48,16 +48,34 @@ web-based cross-browser testing tools for this project.
 * In development
     - Front end improvements:
         - Add ability to make map full screen on mobile report pages. #1655
+        - Move staff-only JavaScript to separate file. #1666
+        - Show loading indicator when loading pins. #1669
         - Allow users to reopen closed reports. #1607
     - Admin improvements:
         - Redirect to category-filtered /reports on login if present. #1622
         - Follow redirect to /admin after login if allowed. #1622
         - Include /admin link on top-level nav for admin users.
         - Add shortlist filters. #1629
+        - Add submit buttons to admin index search forms. #1551
+        - Store user object when deleting report. #1661
+        - Use name at time of moderation, include superusers. #1660
+        - Add customisable defect types. #1674
     - Bugfixes:
         - Fix crash on reports with empty `bodies_str`. #1635
         - Only output appcache/manifest for shortlist users. #1653
         - Fix placeholder typo in French translation.
+        - Make sure report Ajax call is not cached by IE11. #1638
+        - Check cobrand users list when admin merging users. #1662
+        - Make sure emails are lowercased in admin. #1662
+        - Specify options in 'all' status filter. #1664
+        - Be clearer if no states selected is not all states. #1664
+        - Set up correct environment in cobrand PO script. #1616
+        - Allow superuser to leave update when inspecting. #1640
+        - Remove duplicate <> around envelope senders. #1663
+        - Fix invisible segmented controls in old Webkit. #1670
+        - Remove superfluous lists from Open311 JSON output. #1672
+        - Upgrade to using Email::Sender. #1639
+        - Fix bug if test run c. 55 hours before BST starts.
     - Development improvements:
         - Send open reports regardless of current state. #1334
         - Clarify ‘inspected’ behaviour. #1614
@@ -65,6 +83,10 @@ web-based cross-browser testing tools for this project.
         - Refactor main navigation into reusable blocks.
         - Add Problem->time_ago for pretty-printed duration.
         - Add `external_id` field to ResponsePriority.
+        - Use sender in From if From and To domains match. #1651
+        - Refactor SendReport::Open311 to use cobrand hooks. #792
+        - Do upload_dir check on start up, not each report. #1668
+        - Make sure all tests can run offline. #1675
 
 * v2.0.2 (3rd February 2017)
     - Front end changes:
-- 
cgit v1.2.3


From 9ba87b4ea7ede461a757862ac2b6d4859ff0d3b0 Mon Sep 17 00:00:00 2001
From: Nick Jackson <nick@nickjackson.me>
Date: Thu, 1 Dec 2016 13:48:36 +0000
Subject: Add GA tracking URL parameters to links to WriteToThem

---
 templates/web/fixmystreet.com/about/faq-en-gb.html              | 4 ++--
 templates/web/fixmystreet.com/contact/who.html                  | 2 +-
 templates/web/fixmystreet.com/questionnaire/completed-open.html | 2 +-
 templates/web/fixmystreet.com/static/unresponsive.html          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html
index 496282341..0bf55742b 100755
--- a/templates/web/fixmystreet.com/about/faq-en-gb.html
+++ b/templates/web/fixmystreet.com/about/faq-en-gb.html
@@ -318,8 +318,8 @@ correspondence to you – or if you only have an auto-response, you may be able
 to find further contact details there.
 <p>If you still have no joy, we suggest starting a new FixMyStreet report. You
 may also like to use another useful mySociety website, <a
-href="https://www.writetothem.com/">WriteToThem.com</a>, to contact your local
-councillors and ask them to help.
+href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=static_links&utm_medium=link&utm_content=help+what_now">WriteToThem</a>,
+to contact your local councillors and ask them to help.
 </dd>
 
 <dt>Someone has marked my problem was fixed, but it isn't</dt>
diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html
index cdfc4eff8..5fad05dd2 100644
--- a/templates/web/fixmystreet.com/contact/who.html
+++ b/templates/web/fixmystreet.com/contact/who.html
@@ -44,7 +44,7 @@
     <p>
     <strong>If you're not having any luck getting your community problems fixed</strong>,
     you could try contacting your local councillor, using another useful mySociety site:
-    <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>.
+    <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=contact_workflow_links&utm_medium=link&utm_content=contact+not_fixed">WriteToThem</a>.
     </p>
 
     [% END %]
diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html
index 073fb0438..f10d5d266 100644
--- a/templates/web/fixmystreet.com/questionnaire/completed-open.html
+++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html
@@ -13,7 +13,7 @@
     </p>
 
     <p>
-    You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another
+    You can do this on <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=completed+unfixed">WriteToThem</a>, another
     useful mySociety website.
     </p>
 [% END %]
diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html
index be8a3c6e1..8014ab8e1 100644
--- a/templates/web/fixmystreet.com/static/unresponsive.html
+++ b/templates/web/fixmystreet.com/static/unresponsive.html
@@ -26,7 +26,7 @@
 
   <h2>If you’d prefer to use FixMyStreet next time:</h2>
 
-  <a href="https://www.writetothem.com/" class="unresponsive-council-cta">
+  <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=unresponsive_council+cta" class="unresponsive-council-cta">
     <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay
   </a>
 
-- 
cgit v1.2.3


From 69797d3c4d10aed6d5ea57fa94c515a39825f2b2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 30 Mar 2017 14:31:01 +0100
Subject: Forward on all bounces as bounces.

---
 bin/handlemail | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/handlemail b/bin/handlemail
index cc671f786..e027b8f58 100755
--- a/bin/handlemail
+++ b/bin/handlemail
@@ -172,20 +172,19 @@ sub handle_non_bounce_to_null_address {
         To => $data{return_path},
         _body_ => $template,
     });
-    send_mail($mail->as_string, '<>', $data{return_path});
+    send_mail($mail->as_string, $data{return_path});
 }
 
 sub forward_on_to {
     my $recipient = shift;
     my $text = join("\n", @lines) . "\n";
-    my $sender = $data{return_path} || '<>';
-    send_mail($text, $sender, $recipient);
+    send_mail($text, $recipient);
 }
 
 sub send_mail {
-    my ($text, $sender, $recipient) = @_;
+    my ($text, $recipient) = @_;
     if (mySociety::EmailUtil::EMAIL_SUCCESS
-            != mySociety::EmailUtil::send_email($text, $sender, $recipient)) {
+            != mySociety::EmailUtil::send_email($text, '<>', $recipient)) {
         exit(75);
     }
 }
-- 
cgit v1.2.3


From 7d551175641650beee57bdde4032c20020ad4118 Mon Sep 17 00:00:00 2001
From: pezholio <pezholio@gmail.com>
Date: Thu, 30 Mar 2017 15:57:38 +0100
Subject: Use OSM geocoder for Bristol

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

diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
index ecb19b867..fa7f98666 100644
--- a/perllib/FixMyStreet/Cobrand/Bristol.pm
+++ b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -40,6 +40,10 @@ sub disambiguate_location {
     };
 }
 
+sub get_geocoder {
+    return 'OSM'; # use OSM geocoder
+}
+
 sub pin_colour {
     my ( $self, $p, $context ) = @_;
     return 'grey' if $p->state eq 'not responsible';
-- 
cgit v1.2.3


From e607390e176f8fa907433efec2520901c193810f Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 27 Feb 2017 16:47:31 +0000
Subject: Add ability to override Google Maps road style.

---
 web/js/map-google-ol.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js
index 96ec6fe9b..7369a8e9f 100644
--- a/web/js/map-google-ol.js
+++ b/web/js/map-google-ol.js
@@ -33,8 +33,24 @@ fixmystreet.maps.config = function() {
         zoomDuration: 10
     };
 
+    var road_layer = {}; // Empty object defaults to standard road layer
+
+    function apply_map_styles() {
+        var styledMapType = new google.maps.StyledMapType(fixmystreet_google_maps_custom_style);
+        this.mapObject.mapTypes.set('styled', styledMapType);
+        this.mapObject.setMapTypeId('styled');
+    }
+    // If you want to apply a custom style to the road map (for example from
+    // a service such as snazzymaps.com) then define that style as a top-level
+    // variable called fixmystreet_google_maps_custom_style (you might have to
+    // override the maps/google-ol.html template to include your own JS file)
+    // and it'll automatically be applied.
+    if (typeof fixmystreet_google_maps_custom_style !== 'undefined') {
+        road_layer = { type: 'styled', eventListeners: { added: apply_map_styles } };
+    }
+
     fixmystreet.layer_options = [
-        {},
+        road_layer,
         { type: google.maps.MapTypeId.HYBRID }
     ];
 };
-- 
cgit v1.2.3


From 2d9bfa79c92b96d26354fbc5d6749adbb3089a17 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 1 Mar 2017 10:48:36 +0000
Subject: Ignore CuidoMiCiudad cobrand symlinks

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 40fa98c8f..0885b0361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ gh_fixmycommunity
 *[Aa]rregla[Mm]i[Bb]arrio*
 *[Ff]ix[Mm]indelo*
 *[Dd]ans[Mm]on[Qq]wat*
+*[Cc]uido[Mm]i[Cc]iudad*
-- 
cgit v1.2.3


From 35bf6ddb2e58c027a888931bf57de0458cdf898c Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Tue, 7 Mar 2017 16:24:28 +0000
Subject: Set `background-color`, not `background` on nav links

This makes it easier for cobrands to override nav link styles.
---
 web/cobrands/sass/_base.scss   |  8 ++++----
 web/cobrands/sass/_layout.scss | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 25674aedd..54954023b 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -530,24 +530,24 @@ ul.error {
   a, span {
     display: block;
     padding: 0.5em 1em;
-    background: #f6f6f6;
+    background-color: #f6f6f6;
     color: #333;
     font-size: 1.25em;
     border-bottom: 0.25em solid #333;
   }
   a:hover, span.hover {
-    background: #333;
+    background-color: #333;
     color: #fff;
     text-decoration: none;
   }
   span {
-    background: #ccc;
+    background-color: #ccc;
   }
 }
 .nav-menu--mysoc {
   a {
     color: $primary_text;
-    background: $primary;
+    background-color: $primary;
   }
 }
 #mysoc-logo {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index a390a4131..7e56d31bd 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -148,7 +148,7 @@ h1 {
   a, span {
     display: block;
     color: $nav_fg;
-    background: none;
+    background-color: transparent;
     border-bottom: none;
   }
 }
@@ -158,16 +158,16 @@ h1 {
     font-size: 0.9em;
   }
   a:hover {
-    background: $nav_fg_hover;
+    background-color: $nav_fg_hover;
   }
   a.report-a-problem-btn {
     color: $primary_text;
-    background: $primary;
+    background-color: $primary;
     padding:0.25em;
     margin:0.5em;
     @include border-radius(0.25em);
     &:hover {
-      background:$primary/1.1;
+      background-color:$primary/1.1;
     }
   }
   span {
@@ -177,17 +177,17 @@ h1 {
 .nav-menu--mysoc {
   padding: 0em 0.5em;
   margin-#{$left}: 0.25em;
-  background: $primary;
+  background-color: $primary;
   @include border-radius(0 0 0.375em 0.375em);
   a {
-    background:none;
+    background-color: transparent;
     color: $primary_text;
     text-transform: uppercase;
     font-size: 0.6875em;
     padding: 1.3em 0.7em 1em;
     &:hover {
       color: #fff;
-      background: none;
+      background-color: transparent;
     }
   }
 }
-- 
cgit v1.2.3


From 97dd5b788578cedbf65672fd65d88bcf37d9a56b Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Mar 2017 07:54:18 -0400
Subject: Use Google Maps JS API key, if present.

This appends the GOOGLE_MAPS_API_KEY to the Google Maps JavaScript URL
as a `key` parameter.
---
 templates/web/base/maps/google-ol.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index e326bd713..7c7711de9 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -1,6 +1,11 @@
 [%
+google_maps_url = "https://maps.googleapis.com/maps/api/js?v=3";
+IF c.config.GOOGLE_MAPS_API_KEY;
+    google_maps_url = google_maps_url _ "&amp;key=" _ c.config.GOOGLE_MAPS_API_KEY;
+END;
+
 map_js = [
-    "https://maps.googleapis.com/maps/api/js?v=3",
+    google_maps_url,
     version('/js/OpenLayers/OpenLayers.google.js'),
     version('/js/map-OpenLayers.js'),
     version('/js/map-google-ol.js'),
-- 
cgit v1.2.3


From 21bde113503d86f1791e170d1133710a2ed32077 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Mar 2017 10:38:34 -0400
Subject: =?UTF-8?q?Use=20lat/lon=20on=20inspection=20form=20if=20local=20c?=
 =?UTF-8?q?oordinates=20aren=E2=80=99t=20available?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/web/base/report/_inspect.html | 12 +++++++++---
 web/cobrands/fixmystreet/staff.js       |  2 ++
 web/js/map-OpenLayers.js                |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index 5e97de3f4..d2ba1cc88 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -12,9 +12,15 @@
         </p>
         <p>
           [% SET local_coords = problem.local_coords; %]
-          <strong>[% loc('Easting/Northing:') %]</strong>
-          <span id="problem_easting">[% local_coords.0 IF local_coords %]</span>,
-          <span id="problem_northing">[% local_coords.1 IF local_coords %]</span>
+          [% IF local_coords %]
+              <strong>[% loc('Easting/Northing:') %]</strong>
+              <span id="problem_easting">[% local_coords.0 %]</span>,
+              <span id="problem_northing">[% local_coords.1 %]</span>
+          [% ELSE %]
+              <strong>[% loc('Latitude/Longitude:') %]</strong>
+              <span id="problem_latitude">[% problem.latitude %]</span>
+              <span id="problem_longitude">[% problem.longitude %]</span>,
+          [% END %]
           <input type="hidden" name="longitude" value="[% problem.longitude %]">
           <input type="hidden" name="latitude" value="[% problem.latitude %]">
         </p>
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 9825a37ea..b92a70f9c 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -266,6 +266,8 @@ $.extend(fixmystreet.set_up, {
             );
             $("#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));
             $("form#report_inspect_form input[name=latitude]").val(latlon.lat);
             $("form#report_inspect_form input[name=longitude]").val(latlon.lon);
         });
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 2a5af940d..40539f385 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -331,6 +331,8 @@ var fixmystreet = fixmystreet || {};
             );
             $("#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));
             $("form#report_inspect_form input[name=latitude]").val(lonlat.y);
             $("form#report_inspect_form input[name=longitude]").val(lonlat.x);
         },
-- 
cgit v1.2.3


From e5529e430f180cebfa992dff6ac8285870576051 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Mar 2017 10:14:47 -0400
Subject: Improve translatability of various pages.

This commit makes the following parts of the site translatable:

 - Social login buttons
 - Moderation UI
 - Offline glitch page & offline caching UI
 - Dashboard

It also fixes a bug in the nget parser, stops some Oxfordshire bits
being translated for the moment, and brings the translation file up
to date.
---
 bin/gettext-nget-patch                             |   8 +-
 locale/FixMyStreet.po                              | 736 +++++++++++++++------
 perllib/FixMyStreet/Cobrand/Oxfordshire.pm         |   4 +-
 perllib/FixMyStreet/Template.pm                    |   2 +-
 templates/web/base/admin/defecttypes/edit.html     |  12 +-
 templates/web/base/admin/defecttypes/index.html    |   2 +-
 templates/web/base/admin/defecttypes/list.html     |  14 +-
 templates/web/base/admin/exordefects/index.html    |  14 +-
 .../web/base/admin/responsepriorities/edit.html    |   2 +-
 templates/web/base/auth/general.html               |   4 +-
 templates/web/base/dashboard/index.html            |  61 +-
 templates/web/base/js/translation_strings.html     |  20 +-
 templates/web/base/offline/appcache.html           |   7 +-
 templates/web/base/report/_item.html               |   4 +-
 templates/web/base/report/_main.html               |  20 +-
 .../web/base/report/new/form_user_loggedout.html   |   4 +-
 templates/web/base/report/update.html              |  20 +-
 .../base/report/update/form_user_loggedout.html    |   4 +-
 web/cobrands/fixmystreet/fixmystreet.js            |   2 +-
 web/cobrands/fixmystreet/offline.js                |  32 +-
 20 files changed, 652 insertions(+), 320 deletions(-)

diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch
index d058bc784..67f98e319 100755
--- a/bin/gettext-nget-patch
+++ b/bin/gettext-nget-patch
@@ -18,12 +18,12 @@ find( sub {
         do {
             $text .= <FP>;
         } until $text =~ /\)/;
-        if ($text =~ /nget\(\s*"(.*?)"\s*,\s*"(.*?)"\s*,\s*(.*?)\s*\)/s) {
-            $out{$1} = {
+        if ($text =~ /nget\(\s*(['"])(.*?)\1\s*,\s*(['"])(.*?)\3\s*,\s*(.*?)\s*\)/s) {
+            $out{$2} = {
                 file => $File::Find::name,
                 line => $line,
-                s => $1,
-                p => $2,
+                s => $2,
+                p => $4,
             };
         }
     }
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 60c0e8fb7..f04c38bf7 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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695 perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr ""
 
@@ -93,11 +93,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr ""
 
@@ -150,15 +150,15 @@ msgstr ""
 msgid "(optional)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr ""
 
@@ -170,6 +170,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48 templates/web/base/admin/body-form.html:49
 msgid ""
 "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
@@ -177,12 +185,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18 templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
 msgstr ""
@@ -199,11 +215,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -211,7 +227,7 @@ msgstr ""
 msgid "<strong>Yes</strong> I have a password"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:6 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
 msgstr ""
 
@@ -242,15 +258,15 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -262,6 +278,10 @@ msgstr ""
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr ""
@@ -278,6 +298,10 @@ msgstr ""
 msgid "Alert me to future updates"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:138 templates/web/base/dashboard/index.html:21 templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6 templates/web/zurich/reports/index.html:13
 msgid "All Reports"
 msgstr ""
@@ -286,11 +310,11 @@ msgstr ""
 msgid "All Reports as CSV"
 msgstr ""
 
-#: templates/web/base/admin/responsepriorities/list.html:19
+#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29 templates/web/base/reports/_list-filters.html:2 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:6
+#: templates/web/base/main_nav_items.html:0 templates/web/base/main_nav_items.html:27 templates/web/base/reports/_list-filters.html:3 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:6
 msgid "All reports"
 msgstr ""
 
@@ -318,11 +342,11 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:84 templates/web/base/report/display_tools.html:6
+#: templates/web/base/admin/report_edit.html:84 templates/web/base/js/translation_strings.html:66 templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
 
@@ -354,7 +378,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -378,15 +402,23 @@ msgstr ""
 msgid "Auto-response:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:41
+#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402 templates/web/zurich/report/_item.html:9
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417 templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
 
@@ -402,11 +434,11 @@ msgstr ""
 msgid "Ban email address"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:730 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56
+#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56
 msgid "Bodies"
 msgstr ""
 
-#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:57 templates/web/base/admin/reports.html:15 templates/web/base/admin/users.html:18
+#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:63 templates/web/base/admin/reports.html:15 templates/web/base/admin/users.html:18
 msgid "Body"
 msgstr ""
 
@@ -430,15 +462,15 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-checkboxes.html:2 templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
-#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:32 templates/web/base/report/_item.html:82 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50
+#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:38 templates/web/base/report/_item.html:90 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50
 msgid "Category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -446,11 +478,11 @@ msgstr ""
 msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:119 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100
+#: templates/web/base/admin/report_edit.html:119 templates/web/base/dashboard/index.html:29 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100
 msgid "Category:"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr ""
 
@@ -499,10 +531,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72 templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
 msgstr ""
@@ -527,15 +563,15 @@ msgstr ""
 msgid "Click the link in our confirmation email to sign in."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:43 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/_item.html:43 templates/web/base/report/banner.html:15 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:18 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -559,6 +595,10 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646 templates/web/base/admin/config_page.html:1
 msgid "Configuration"
 msgstr ""
@@ -608,7 +648,7 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668 perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr ""
 
@@ -624,6 +664,26 @@ msgstr ""
 msgid "Council contacts for %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:83
+msgid "Council has marked as closed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:57
+msgid "Council has marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -644,15 +704,15 @@ msgstr ""
 msgid "Create category"
 msgstr ""
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -688,7 +748,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
 msgstr ""
 
@@ -696,6 +760,10 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
+#: templates/web/base/report/_main.html:110 templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12
 msgid "Description"
 msgstr ""
@@ -724,6 +792,10 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114 templates/web/base/report/update.html:61
+msgid "Discard changes"
+msgstr ""
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -745,19 +817,19 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 msgid "Duplicates"
 msgstr ""
 
@@ -769,7 +841,7 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15 templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16 templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -777,27 +849,27 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: templates/web/base/admin/body.html:140 templates/web/base/admin/index.html:35 templates/web/zurich/admin/body.html:69
+#: templates/web/base/admin/body.html:140 templates/web/base/admin/index.html:39 templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -821,7 +893,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -837,7 +909,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr ""
 
@@ -876,7 +948,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -900,7 +972,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:11 templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20 templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -912,19 +984,27 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:36
+#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 perllib/FixMyStreet/Cobrand/Zurich.pm:913 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:12
 msgid "Extern"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/report_edit.html:97 templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -944,7 +1024,7 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:116 templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134 templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -964,11 +1044,11 @@ msgstr ""
 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:17 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -976,7 +1056,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -984,7 +1064,7 @@ msgstr ""
 msgid "Fixed:"
 msgstr ""
 
-#: templates/web/base/admin/body-form.html:95 templates/web/base/admin/responsepriorities/edit.html:31 templates/web/zurich/admin/body-form.html:36
+#: templates/web/base/admin/body-form.html:95 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
 
@@ -1060,7 +1140,7 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:44 templates/web/zurich/admin/stats.html:26
+#: templates/web/base/admin/index.html:28 templates/web/base/admin/index.html:34 templates/web/base/admin/index.html:49 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:38 templates/web/base/reports/_list-filters.html:53 templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
 
@@ -1068,11 +1148,11 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1088,7 +1168,7 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/footer.html:35 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:23 templates/web/zurich/nav_over_content.html:8
+#: templates/web/base/main_nav_items.html:40 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:23 templates/web/zurich/nav_over_content.html:8
 msgid "Help"
 msgstr ""
 
@@ -1104,10 +1184,14 @@ msgstr ""
 msgid "Hi %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:12 templates/web/base/report/inspect/state_groups_select.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
 msgstr ""
 
+#: templates/web/base/report/_main.html:105
+msgid "Hide entire report"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr ""
@@ -1116,6 +1200,10 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr ""
@@ -1144,7 +1232,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:54 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:21 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.html:11
+#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:60 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:21 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.html:11
 msgid "ID"
 msgstr ""
 
@@ -1154,6 +1242,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1164,7 +1256,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1218,7 +1310,7 @@ msgstr ""
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
+#: templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
 msgstr ""
 
@@ -1230,7 +1322,7 @@ 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 ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:18 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:5 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8
 msgid "In progress"
 msgstr ""
 
@@ -1246,7 +1338,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1254,7 +1346,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1262,31 +1354,35 @@ msgstr ""
 msgid "Internal notes"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:140 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:4 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
 msgstr ""
 
@@ -1310,6 +1406,14 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+msgid "Last 7 days"
+msgstr ""
+
 #: templates/web/base/admin/body.html:74 templates/web/zurich/admin/body.html:16
 msgid "Last editor"
 msgstr ""
@@ -1322,11 +1426,11 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20 templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1334,6 +1438,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr ""
@@ -1350,7 +1458,7 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31 templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr ""
 
@@ -1358,15 +1466,31 @@ msgstr ""
 msgid "Locate the problem on a map of the area"
 msgstr ""
 
+#: templates/web/base/auth/general.html:22 templates/web/base/report/new/form_user_loggedout.html:6 templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30 templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145 templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1390,7 +1514,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1410,7 +1534,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1418,7 +1542,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1426,19 +1550,31 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+msgid "Moderate this update"
+msgstr ""
+
+#: templates/web/base/report/_main.html:69 templates/web/base/report/update.html:49
+msgid "Moderated by %s at %s"
+msgstr ""
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109 templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
-#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:56 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:106 templates/web/base/report/new/form_user_loggedin.html:40 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:23 templates/web/base/reports/index.html:23 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59
+#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:106 templates/web/base/report/new/form_user_loggedin.html:40 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:23 templates/web/base/reports/index.html:23 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59
 msgid "Name"
 msgstr ""
 
@@ -1450,7 +1586,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1458,7 +1594,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1466,7 +1602,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1544,7 +1680,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1552,7 +1688,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55
 msgid "No"
 msgstr ""
 
@@ -1568,7 +1704,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr ""
 
@@ -1584,7 +1720,7 @@ msgstr ""
 msgid "No flagged users found."
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:8 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
 msgid "No further action"
 msgstr ""
 
@@ -1592,6 +1728,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1624,7 +1768,7 @@ msgid ""
 "                activity across their body), the ability to hide reports or set special report statuses."
 msgstr ""
 
-#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
+#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:9 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
 msgstr ""
 
@@ -1676,6 +1820,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -1692,11 +1844,11 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:139 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:16 templates/web/base/report/inspect/state_groups_select.html:3 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18
 msgid "Open"
 msgstr ""
 
@@ -1736,7 +1888,7 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/DB/Result/Problem.pm:626 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:642 perllib/FixMyStreet/DB/Result/Problem.pm:649 perllib/FixMyStreet/DB/Result/Problem.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:673 perllib/FixMyStreet/Script/Reports.pm:183 perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr ""
 
@@ -1764,11 +1916,11 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -1808,7 +1960,7 @@ msgstr ""
 msgid "Place pin on map"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:140 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9
 msgid "Planned"
 msgstr ""
 
@@ -1824,11 +1976,11 @@ msgstr ""
 msgid "Please check your email address is correct"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:868 perllib/FixMyStreet/DB/Result/Problem.pm:441 templates/web/base/js/translation_strings.html:9
+#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:844 perllib/FixMyStreet/App/Controller/Report/New.pm:867 perllib/FixMyStreet/DB/Result/Problem.pm:456 templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -1851,7 +2003,7 @@ msgstr ""
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -1863,11 +2015,11 @@ msgstr ""
 msgid "Please enter a password"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:424 templates/web/base/js/translation_strings.html:3
+#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:439 templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 perllib/FixMyStreet/App/Controller/Admin.pm:1361 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16
 msgid "Please enter a valid email"
 msgstr ""
 
@@ -1875,7 +2027,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427 templates/web/base/js/translation_strings.html:4
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442 templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
 
@@ -1891,11 +2043,11 @@ msgstr ""
 msgid "Please enter your first name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319 templates/web/base/js/translation_strings.html:7
+#: perllib/FixMyStreet/Cobrand/UK.pm:320 templates/web/base/js/translation_strings.html:7
 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.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:435 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:450 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
 msgstr ""
 
@@ -1951,7 +2103,7 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -1983,7 +2135,7 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129 perllib/FixMyStreet/App/Model/PhotoSet.pm:163 perllib/FixMyStreet/App/Model/PhotoSet.pm:165 templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 perllib/FixMyStreet/App/Model/PhotoSet.pm:158 templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2003,15 +2155,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2027,11 +2179,11 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96 templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113 templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2067,7 +2219,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2075,7 +2227,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706 templates/web/base/admin/flagged.html:10
+#: perllib/FixMyStreet/Cobrand/Default.pm:705 templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
 
@@ -2095,11 +2247,11 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/Default.pm:833 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2140,7 +2292,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2168,19 +2320,19 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2188,11 +2340,11 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2208,7 +2360,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2225,7 +2377,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2257,11 +2409,11 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:68
+#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:4
+#: templates/web/base/header_logo.html:2 templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
 
@@ -2277,6 +2429,10 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+msgid "Report state:"
+msgstr ""
+
 #: templates/web/base/report/new/fill_in_details_form.html:1 templates/web/base/report/new/login_success_form.html:1 templates/web/base/report/new/oauth_email_form.html:1
 msgid "Report your problem"
 msgstr ""
@@ -2285,7 +2441,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606 templates/web/base/contact/index.html:55
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653 templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
 
@@ -2293,7 +2449,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630 templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677 templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
 
@@ -2305,27 +2461,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2341,11 +2497,11 @@ msgstr ""
 msgid "Reporting a problem"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/zurich/header.html:52
+#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/dashboard/index.html:134 templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2353,10 +2509,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2365,7 +2517,11 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+msgid "Reports saved offline."
+msgstr ""
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2377,10 +2533,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2409,6 +2561,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28 templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
 msgstr ""
@@ -2421,11 +2585,11 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 perllib/FixMyStreet/App/Controller/Admin.pm:1730 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 perllib/FixMyStreet/App/Controller/Admin.pm:1747 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119
 msgid "Rotate Right"
 msgstr ""
 
@@ -2433,27 +2597,33 @@ msgstr ""
 msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:11
+#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
-#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:150 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29
+#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:46 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:168 templates/web/base/report/_main.html:113 templates/web/base/report/update.html:60 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24 templates/web/base/admin/reports.html:1 templates/web/zurich/admin/reports.html:1
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports.html:1 templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -2477,7 +2647,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -2509,7 +2679,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -2521,7 +2691,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -2529,11 +2699,11 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29
+#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29
 msgid "Shortlist"
 msgstr ""
 
-#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25
+#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25 templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -2541,19 +2711,35 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+msgid "Show Photo?"
+msgstr ""
+
 #: templates/web/base/report/new/form_user_loggedin.html:54 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+msgid "Show photo"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
-#: templates/web/base/auth/general.html:117 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/base/footer.html:26 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
+#: templates/web/base/auth/general.html:117 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35
 msgid "Sign in"
 msgstr ""
 
@@ -2588,7 +2774,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -2612,15 +2798,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -2636,7 +2828,7 @@ msgstr ""
 msgid "Start Date:"
 msgstr ""
 
-#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:66 templates/web/base/report/_item.html:86 templates/web/base/report/update/form_update.html:39
+#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:83 templates/web/base/report/_item.html:94 templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
 
@@ -2644,7 +2836,7 @@ msgstr ""
 msgid "State:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:640 perllib/FixMyStreet/Cobrand/Zurich.pm:386 templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1 templates/web/base/admin/stats_by_state.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
+#: perllib/FixMyStreet/Cobrand/Default.pm:640 perllib/FixMyStreet/Cobrand/Zurich.pm:386 templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 templates/web/base/admin/stats_by_state.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
 msgstr ""
 
@@ -2660,7 +2852,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -2680,7 +2872,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38
+#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:170 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38
 msgid "Submit changes"
 msgstr ""
 
@@ -2716,11 +2908,11 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -2776,7 +2968,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -2788,7 +2980,7 @@ msgstr ""
 msgid "That location does not appear to be in the UK; please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -2928,7 +3120,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28
 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
 msgstr ""
 
@@ -2994,15 +3186,15 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882 perllib/FixMyStreet/App/Controller/Report/New.pm:926 perllib/FixMyStreet/App/Controller/Report/New.pm:972 perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881 perllib/FixMyStreet/App/Controller/Report/New.pm:925 perllib/FixMyStreet/App/Controller/Report/New.pm:971 perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3018,14 +3210,18 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/update/form_update.html:54
+msgid "This problem is still ongoing"
+msgstr ""
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3066,7 +3262,7 @@ msgstr ""
 msgid "Tips for perfect photos"
 msgstr ""
 
-#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:55 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:10
+#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:61 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:10
 msgid "Title"
 msgstr ""
 
@@ -3090,7 +3286,23 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107 templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+msgid "Total marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124 templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3098,7 +3310,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3118,7 +3330,7 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12 templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3138,6 +3350,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3190,7 +3406,7 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1223 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157 perllib/FixMyStreet/App/Controller/Admin.pm:1221 perllib/FixMyStreet/App/Controller/Admin.pm:1384 perllib/FixMyStreet/App/Controller/Admin.pm:822 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857
 msgid "Updated!"
 msgstr ""
 
@@ -3227,23 +3443,27 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:58
+msgid "User has marked as fixed"
+msgstr ""
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:724 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
+#: perllib/FixMyStreet/Cobrand/Default.pm:669 perllib/FixMyStreet/Cobrand/Default.pm:723 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3267,6 +3487,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3283,7 +3512,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3299,6 +3528,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -3315,11 +3548,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -3351,11 +3584,16 @@ msgstr ""
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr ""
 
-#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202 templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53
 msgid "Yes"
 msgstr ""
 
@@ -3367,6 +3605,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -3406,6 +3648,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -3457,7 +3703,7 @@ msgstr ""
 msgid "Your Reports"
 msgstr ""
 
-#: templates/web/base/auth/change_password.html:11 templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/auth/change_password.html:11 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -3477,6 +3723,10 @@ msgstr ""
 msgid "Your name"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:62
+msgid "Your offline reports"
+msgstr ""
+
 #: templates/web/base/auth/general.html:85 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34
 msgid "Your password"
 msgstr ""
@@ -3501,6 +3751,10 @@ msgstr ""
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -3509,7 +3763,7 @@ msgstr ""
 msgid "Yourself"
 msgstr ""
 
-#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -3517,7 +3771,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -3541,47 +3795,47 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:54 templates/web/zurich/report/_item.html:14
+#: templates/web/base/report/_item.html:61 templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261 perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -3589,7 +3843,7 @@ msgstr ""
 msgid "n/a"
 msgstr ""
 
-#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -3613,7 +3867,7 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265 perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -3633,7 +3887,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -3641,6 +3895,14 @@ msgstr ""
 msgid "today"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:73
+msgid "update"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:74
+msgid "updates"
+msgstr ""
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -3657,27 +3919,41 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:246
+#, 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"
@@ -3685,13 +3961,20 @@ msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -3720,6 +4003,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/base/report/_item.html:49
+#, 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."
@@ -3733,3 +4023,17 @@ 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.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] ""
+msgstr[1] ""
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index 78247e39d..3e262a700 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -162,10 +162,10 @@ sub admin_pages {
     # Oxfordshire have a custom admin page for downloading reports in an Exor-
     # friendly format which anyone with report_instruct permission can use.
     if ( $user->has_body_permission_to('report_instruct') ) {
-        $pages->{exordefects} = [ _('Download Exor RDI'), 10 ];
+        $pages->{exordefects} = [ ('Download Exor RDI'), 10 ];
     }
     if ( $user->has_body_permission_to('defect_type_edit') ) {
-        $pages->{defecttypes} = [ _('Defect Types'), 11 ];
+        $pages->{defecttypes} = [ ('Defect Types'), 11 ];
         $pages->{defecttype_edit} = [ undef, undef ];
     };
 
diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm
index f41d11b69..4a9cffecb 100644
--- a/perllib/FixMyStreet/Template.pm
+++ b/perllib/FixMyStreet/Template.pm
@@ -62,7 +62,7 @@ sub loc : Fn {
 
 =head2 nget
 
-    [% nget( 'singular', 'plural', $number ) %]
+    [% nget( 'singular', 'plural', $number ) %]
 
 Use first or second string depending on the number.
 
diff --git a/templates/web/base/admin/defecttypes/edit.html b/templates/web/base/admin/defecttypes/edit.html
index 65c8a5ab7..a3b324d11 100644
--- a/templates/web/base/admin/defecttypes/edit.html
+++ b/templates/web/base/admin/defecttypes/edit.html
@@ -1,7 +1,7 @@
-[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Type for %s'), body.name) -%]
+[% INCLUDE 'admin/header.html' title=tprintf(('Defect Type for %s'), body.name) -%]
 [% dt = defect_type %]
 
-[% UNLESS dt.id %]<h3>[% loc('New defect type') %]</h3>[% END %]
+[% UNLESS dt.id %]<h3>[% ('New defect type') %]</h3>[% END %]
 
 <form method="post"
     action="[% c.uri_for('', body.id, dt.id || 'new' ) %]"
@@ -10,17 +10,17 @@
     class="validate">
 
     <p>
-        <strong>[% loc('Name:') %] </strong>
+        <strong>[% ('Name:') %] </strong>
         <input type="text" name="name" class="required form-control" size="30" value="[% dt.name | html %]">
     </p>
     <p>
-        <strong>[% loc('Description:') %] </strong>
+        <strong>[% ('Description:') %] </strong>
         <input type="text" name="description" class="form-control" size="30" value="[% dt.description | html %]">
     </p>
 
     <div class="admin-hint">
       <p>
-        [% loc('If you only want this defect type to be an option for specific categories, pick them here. By default they will show for all categories.') %]
+        [% ('If you only want this defect type to be an option for specific categories, pick them here. By default they will show for all categories.') %]
       </p>
     </div>
 
@@ -30,7 +30,7 @@
 
     <p>
       <input type="hidden" name="token" value="[% csrf_token %]" >
-      <input type="submit" class="btn" name="save" value="[% dt.id ? loc('Save changes') : loc('Create defect type') %]" >
+      <input type="submit" class="btn" name="save" value="[% dt.id ? ('Save changes') : ('Create defect type') %]" >
     </p>
 </form>
 
diff --git a/templates/web/base/admin/defecttypes/index.html b/templates/web/base/admin/defecttypes/index.html
index 2e6ce7e1b..c45a09e6e 100644
--- a/templates/web/base/admin/defecttypes/index.html
+++ b/templates/web/base/admin/defecttypes/index.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'admin/header.html' title=loc('Defect Types') -%]
+[% INCLUDE 'admin/header.html' title=('Defect Types') -%]
 
 <ul>
     [% FOR body IN bodies %]
diff --git a/templates/web/base/admin/defecttypes/list.html b/templates/web/base/admin/defecttypes/list.html
index 1a9cb4fa7..783bd085c 100644
--- a/templates/web/base/admin/defecttypes/list.html
+++ b/templates/web/base/admin/defecttypes/list.html
@@ -1,11 +1,11 @@
-[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Types for %s'), body.name) -%]
+[% INCLUDE 'admin/header.html' title=tprintf(('Defect Types for %s'), body.name) -%]
 
 <table>
     <thead>
     <tr>
-        <th>  [% loc('Name') %] </th>
-        <th>  [% loc('Description') %] </th>
-        <th>  [% loc('Categories') %] </th>
+        <th>  [% ('Name') %] </th>
+        <th>  [% ('Description') %] </th>
+        <th>  [% ('Categories') %] </th>
         <th>  &nbsp; </th>
     </tr>
     </thead>
@@ -17,19 +17,19 @@
               <td>  [% d.description | html %] </td>
               <td>
                 [% UNLESS d.contacts.size %]
-                  <em>[% loc('All categories') %]</em>
+                  <em>[% ('All categories') %]</em>
                 [% ELSE %]
                   [% FOR contact IN d.contacts %]
                     [% contact.category %][% ',' UNLESS loop.last %]
                   [% END %]
                 [% END %]
               </td>
-              <td> <a href="[% c.uri_for('', body.id, d.id) %]" class="btn">[% loc('Edit') %]</a> </td>
+              <td> <a href="[% c.uri_for('', body.id, d.id) %]" class="btn">[% ('Edit') %]</a> </td>
           </tr>
       [% END %]
     </tbody>
 </table>
 
-<a href="[% c.uri_for('', body.id, 'new') %]" class="btn">[% loc('New defect type') %]</a>
+<a href="[% c.uri_for('', body.id, 'new') %]" class="btn">[% ('New defect type') %]</a>
 
 [% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/admin/exordefects/index.html b/templates/web/base/admin/exordefects/index.html
index 06d2aa7a5..dba58198d 100644
--- a/templates/web/base/admin/exordefects/index.html
+++ b/templates/web/base/admin/exordefects/index.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'admin/header.html' title=loc('Download Exor RDI') -%]
+[% INCLUDE 'admin/header.html' title=('Download Exor RDI') -%]
 
 [% IF error_message %]
     <h2>Error</h2>
@@ -7,20 +7,20 @@
 
 <form method="get" action="[% c.uri_for('download') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p>
-    <label for="start_date">[% loc('Start Date:') %]</label><input type="text" class="form-control"
-      placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date"
+    <label for="start_date">[% ('Start Date:') %]</label><input type="text" class="form-control"
+      placeholder="[% ('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date"
       value="[% start_date ? start_date.strftime( '%d/%m/%Y') : '' | html %]" />
     </p>
 
     <p>
-    <label for="end_date">[% loc('End Date:') %]</label><input type="text" class="form-control"
-      placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5"
+    <label for="end_date">[% ('End Date:') %]</label><input type="text" class="form-control"
+      placeholder="[% ('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5"
       value="[% end_date ? end_date.strftime( '%d/%m/%Y') : '' | html %]" />
     </p>
 
     <p>
-    [% loc('Inspector:') %] <select class="form-control" id='user_id' name='user_id'>
-        <option value=''>[% loc('All inspectors') %]</option>
+    [% ('Inspector:') %] <select class="form-control" id='user_id' name='user_id'>
+        <option value=''>[% ('All inspectors') %]</option>
         [% FOR inspector IN inspectors %]
             <option value="[% inspector.id %]" [% 'selected' IF user_id == inspector.id %]>[% inspector.name %] ([% inspector.get_extra_metadata('initials') %])</option>
         [% END %]
diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html
index a4dc61213..07d6906ba 100644
--- a/templates/web/base/admin/responsepriorities/edit.html
+++ b/templates/web/base/admin/responsepriorities/edit.html
@@ -24,7 +24,7 @@
       </p>
     </div>
     <p>
-        <strong>[% loc('External ID:') %] </strong>
+        <strong>[% loc('External ID') %]:</strong>
         <input type="text" name="external_id" class="form-control" size="30" value="[% rp.external_id | html %]">
     </p>
 
diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html
index cf539ff4f..41ff3a2e1 100644
--- a/templates/web/base/auth/general.html
+++ b/templates/web/base/auth/general.html
@@ -19,7 +19,7 @@
       <div class="form-box">
         <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook">
             <img alt="" src="/i/facebook-icon-32.png" width="17" height="32">
-            Log in with Facebook
+            [% loc('Log in with Facebook') %]
         </button>
       </div>
     [% END %]
@@ -27,7 +27,7 @@
       <div class="form-box">
         <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter">
             <img alt="" src="/i/twitter-icon-32.png" width="17" height="32">
-            Log in with Twitter
+            [% loc('Log in with Twitter') %]
         </button>
       </div>
     [% END %]
diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html
index 1af507569..2a9a2ef42 100644
--- a/templates/web/base/dashboard/index.html
+++ b/templates/web/base/dashboard/index.html
@@ -12,14 +12,13 @@
 <form>
 
 <hgroup>
-    <h2>Reports, Statistics and Actions for</h2>
-    <h1>[% council.name %]</h1>
+    [% tprintf(loc('<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>'), council.name) %]
 </hgroup>
 
 <div class="filters">
     <p>
-        <label for="ward">Ward:</label>
-        <select class="form-control" name="ward"><option value=''>All</option>
+        <label for="ward">[% loc('Ward:') %]</label>
+        <select class="form-control" name="ward"><option value=''>[% loc('All') %]</option>
             [% FOR w IN children.values.sort('name') %]
                 <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option>
             [% END %]
@@ -27,8 +26,8 @@
     </p>
 
     <p>
-        <label for="category">Report category:</label>
-        <select class="form-control" name="category"><option value=''>All</option>
+        <label for="category">[% loc('Category:') %]</label>
+        <select class="form-control" name="category"><option value=''>[% loc('All') %]</option>
             [% FOR cat_op IN category_options %]
                 <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option>
             [% END %]
@@ -36,7 +35,7 @@
     </p>
 
     <p>
-        <input type="submit" class="btn" value="Look up">
+        <input type="submit" class="btn" value="[% loc('Look up') %]">
     </p>
 
     <br clear="all" />
@@ -46,17 +45,17 @@
 <table width="100%" id="overview">
     <tr>
         <th>&nbsp;</th>
-        <th scope="col"><abbr title="Week To Date">WTD</abbr></th>
-        <th scope="col">Last 7 days</th>
-        <th scope="col">Last 4 weeks</th>
-        <th scope="col">YTD</th>
+        <th scope="col"><abbr title="[% loc('Week To Date') %]">[% loc('WTD', "Week to date") %]</abbr></th>
+        <th scope="col">[% loc('Last 7 days') %]</th>
+        <th scope="col">[% loc('Last 4 weeks') %]</th>
+        <th scope="col">[% loc('YTD', "Year to date") %]</th>
     </tr>
 
     [%
     rows = {
-        '0' => [ "total", "Total reports received" ]
-        '1' => [ "fixed - council", "Council has marked as fixed" ]
-        '2' => [ "fixed_user", "User has marked as fixed" ]
+        '0' => [ "total", loc("Total reports received") ]
+        '1' => [ "fixed - council", loc("Council has marked as fixed") ]
+        '2' => [ "fixed_user", loc("User has marked as fixed") ]
     };
     FOR row IN rows %]
     <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]">
@@ -69,7 +68,7 @@
     [% END %]
 
     <tr class='subtotal' id="total_fixed">
-        <th scope="row">Total marked as fixed</th>
+        <th scope="row">[% loc('Total marked as fixed') %]</th>
         <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td>
         <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td>
         <td>[% problems.weeks.${"fixed - council"} + problems.weeks.fixed_user %]</td>
@@ -78,10 +77,10 @@
 
     [%
     rows = {
-        '0' => [ "in progress", "Council has marked as in progress" ]
-        '1' => [ "action scheduled", "Council has marked as planned" ]
-        '2' => [ "investigating", "Council has marked as investigating" ]
-        '3' => [ "closed", "Council has marked as closed" ]
+        '0' => [ "in progress", loc("Council has marked as in progress") ]
+        '1' => [ "action scheduled", loc("Council has marked as planned") ]
+        '2' => [ "investigating", loc("Council has marked as investigating") ]
+        '3' => [ "closed", loc("Council has marked as closed") ]
     };
     wtd = 0, week = 0, weeks = 0, ytd = 0;
     FOR row IN rows %]
@@ -95,7 +94,7 @@
     [% END %]
 
     <tr class='subtotal' id="marked">
-        <th scope="row">Total marked</th>
+        <th scope="row">[% loc('Total marked') %]</th>
         <td>[% problems.wtd.${"in progress"} + problems.wtd.${"action scheduled"} +
             problems.wtd.investigating + problems.wtd.closed %]</td>
         <td>[% problems.week.${"in progress"} + problems.week.${"action scheduled"} +
@@ -107,7 +106,7 @@
     </tr>
 
     <tr id="avg_fixed">
-        <th scope="row">Average time to council marking fixed (days)</th>
+        <th scope="row">[% loc('Average time to council marking fixed (days)') %]</th>
         <td>[% problems.wtd.time_to_fix %]</td>
         <td>[% problems.week.time_to_fix %]</td>
         <td>[% problems.weeks.time_to_fix %]</td>
@@ -115,7 +114,7 @@
     </tr>
 
     <tr id="avg_marked">
-        <th scope="row">Average time to first council state change (days)</th>
+        <th scope="row">[% loc('Average time to first council state change (days)') %]</th>
         <td>[% problems.wtd.time_to_mark %]</td>
         <td>[% problems.week.time_to_mark %]</td>
         <td>[% problems.weeks.time_to_mark %]</td>
@@ -123,7 +122,7 @@
     </tr>
 
     <tr class='subtotal' id="not_marked">
-        <th scope="row">Total not marked</th>
+        <th scope="row">[% loc('Total not marked') %]</th>
         <td>[% problems.wtd.not_marked %]</td>
         <td>[% problems.week.not_marked %]</td>
         <td>[% problems.weeks.not_marked %]</td>
@@ -132,25 +131,25 @@
 
 </table>
 
-<h2>Reports</h2>
+<h2>[% loc('Reports') %]</h2>
 
                 </select>
-<p>Report state: <select class="form-control" name="state">
-<option value=''>All</option>
+<p>[% loc('Report state:') %] <select class="form-control" name="state">
+<option value=''>[% loc('All') %]</option>
                 [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
                 loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress',
                 loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %]
                     <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option>
                 [% END %]
 </select>
-<input type="submit" class="btn" value="Look up">
-<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">Export as CSV</a>
+<input type="submit" class="btn" value="[% loc('Look up') %]">
+<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a>
 
 <table width="100%" id="reports">
     <tr>
-        <th scope="col">Less than 7 days old</th>
-        <th scope="col">7-14 days old</th>
-        <th scope="col">14-30 days old</th>
+        <th scope="col">[% loc('Less than 7 days old') %]</th>
+        <th scope="col">[% loc('7-14 days old') %]</th>
+        <th scope="col">[% loc('14-30 days old') %]</th>
     </tr>
     <tr>
         <td width="34%"><ul>[% INCLUDE list, list = lists.1 %]</ul></td>
diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html
index c09609411..b90a4d576 100644
--- a/templates/web/base/js/translation_strings.html
+++ b/templates/web/base/js/translation_strings.html
@@ -54,5 +54,23 @@
         upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]',
         upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]',
         upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]',
-        upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]'
+        upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]',
+
+        login_with_email: '[% loc('Log in with email') | replace("'", "\\'") %]',
+
+        offline: {
+            your_reports: '[% loc('Your offline reports') | replace("'", "\\'") %]',
+            update_saved: '[% loc('Your update has been saved offline for submission when back online.') | replace("'", "\\'") %]',
+            update_data_saved: '[% loc('Offline update data saved') | replace("'", "\\'") %]',
+            clear_data: '[% loc('Clear offline data') | replace("'", "\\'") %]',
+            are_you_sure: '[% loc('Are you sure?') | replace("'", "\\'") %]',
+            data_cleared: '[% loc('Offline data cleared') | replace("'", "\\'") %]',
+            reports_saved: '[% loc('Reports saved offline.') | replace("'", "\\'") %]',
+            saving_reports: '[% loc('Saving reports offline', 'This is followed by a progress count, e.g. 3/5') | replace("'", "\\'") %]',
+            you_are_offline: '[% loc('You are offline') | replace("'", "\\'") %]',
+            N_saved: '[% loc('<span>%s</span> saved.') | replace("'", "\\'") %]',
+            saved_to_submit: '[% loc('You have <a id="oFN" href=""><span>%s</span> saved to submit</a>.') | replace("'", "\\'") %]',
+            update_single: '[% loc('update') | replace("'", "\\'") %]',
+            update_plural: '[% loc('updates') | replace("'", "\\'") %]'
+        }
     };
diff --git a/templates/web/base/offline/appcache.html b/templates/web/base/offline/appcache.html
index 5a8ba1463..ba54b229a 100644
--- a/templates/web/base/offline/appcache.html
+++ b/templates/web/base/offline/appcache.html
@@ -1,9 +1,10 @@
 [% INCLUDE 'header.html' appcache = 1 bodyclass = "fullwidthpage" %]
 
-<h1>Internet glitch</h1>
+<h1>[% loc('Internet glitch') %]</h1>
 
-<p>Sorry, we don’t have a good enough connection to fetch that page, or the
-page wasn’t found or there was a server error. Please try again later.</p>
+<p>[% loc('Sorry, we don’t have a good enough connection to fetch that page, or the
+page wasn’t found or there was a server error. Please try again later.') %]
+</p>
 
 <ul class="item-list item-list--reports" id="offline_list"></ul>
 
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 712044592..e627227d4 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -46,7 +46,7 @@
             [% END %]
             [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %]
                 [%- IF problem.days_ago > 0 AND problem.days_ago <= c.cobrand.display_days_ago_threshold %]
-                  [% tprintf( nget( loc('Reported %d day ago'), loc('Reported %d days ago'), problem.days_ago), problem.days_ago ) %]
+                  [% tprintf( nget('Reported %d day ago', 'Reported %d days ago', problem.days_ago), problem.days_ago ) %]
                 [%- ELSE %]
                   [% prettify_dt( problem.confirmed, 1 ) %]
                 [%- END %]
@@ -56,7 +56,7 @@
             [%- IF dist %], [% dist %]km[% END %]
             [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [%- IF problem.days_ago('lastupdate') > 0 AND problem.days_ago('lastupdate') <= c.cobrand.display_days_ago_threshold %]
-                  [% tprintf( nget( loc('last updated %d day ago'), loc('last updated %d days ago'), problem.days_ago('lastupdate') ), problem.days_ago('lastupdate') ) %]
+                  [% tprintf( nget('last updated %d day ago', 'last updated %d days ago', problem.days_ago('lastupdate') ), problem.days_ago('lastupdate') ) %]
                 [%- ELSE %]
                   [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) )  %]
                 [%- END %]
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 12733a992..83a3a1109 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -47,7 +47,7 @@
       [% IF problem.title != original.title %]
         <label>
             <input type="checkbox" name="problem_revert_title" class="revert-title">
-            Revert to original title
+            [% loc('Revert to original title') %]
         </label>
       [% END %]
         <h1><input class="form-control" type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1>
@@ -57,7 +57,7 @@
     <div class="moderate-edit">
         <label>
             <input type="checkbox" name="problem_show_name" [% 'checked' UNLESS problem.anonymous %]>
-            Show reporter&rsquo;s name
+            [% loc('Show reporter&rsquo;s name') %]
         </label>
     </div>
     <p class="report_meta_info">
@@ -66,7 +66,7 @@
 
     [% INCLUDE 'report/_main_sent_info.html' %]
     [% mlog = problem.latest_moderation_log_entry(); IF mlog %]
-        <p>Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %]</p>
+        <p>[% tprintf(loc('Moderated by %s at %s'), mlog.admin_user, prettify_dt(mlog.whenedited)) %]</p>
     [% END %]
 
     [% INCLUDE 'report/_support.html' %]
@@ -76,7 +76,7 @@
         <p class="moderate-edit">
             <label>
                 <input type="checkbox" name="problem_show_photo" [% problem.photo ? 'checked' : '' %]>
-                Show photo
+                [% loc('Show photo') %]
             </label>
         </p>
     [% END %]
@@ -92,7 +92,7 @@
       [% IF problem.detail != original.detail %]
         <label>
             <input type="checkbox" name="problem_revert_detail" class="revert-textarea">
-            Revert to original text
+            [% loc('Revert to original text') %]
         </label>
       [% END %]
         <textarea class="form-control" name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea>
@@ -102,16 +102,16 @@
         <p>
             <label>
                 <input type="checkbox" class="hide-document" name="problem_hide" [% problem.hidden ? 'checked' : '' %]>
-                Hide entire report
+                [% loc('Hide entire report') %]
             </label>
         </p>
         <p>
-            <label for="moderation_reason">Moderation reason:</label>
-            <input type="text" class="form-control" name="moderation_reason" placeholder="Describe why you are moderating this">
+            <label for="moderation_reason">[% loc('Moderation reason:') %]</label>
+            <input type="text" class="form-control" name="moderation_reason" placeholder="[% loc('Describe why you are moderating this') %]">
         </p>
         <p>
-            <input type="submit" class="green-btn" value="Save changes">
-            <input type="button" class="btn cancel" value="Discard changes">
+            <input type="submit" class="green-btn" value="[% loc('Save changes') %]">
+            <input type="button" class="btn cancel" value="[% loc('Discard changes') %]">
         </p>
     </div>
   [% END %]
diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html
index c444ebce4..4142f4582 100644
--- a/templates/web/base/report/new/form_user_loggedout.html
+++ b/templates/web/base/report/new/form_user_loggedout.html
@@ -3,7 +3,7 @@
     <div class="form-box">
     <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook">
         <img alt="" src="/i/facebook-icon-32.png" width="17" height="32">
-        Log in with Facebook
+        [% loc('Log in with Facebook') %]
     </button>
     </div>
   [% END %]
@@ -11,7 +11,7 @@
     <div class="form-box">
     <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter">
         <img alt="" src="/i/twitter-icon-32.png" width="17" height="32">
-        Log in with Twitter
+        [% loc('Log in with Twitter') %]
     </button>
     </div>
   [% END %]
diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html
index 752f20174..51c1a9e4f 100644
--- a/templates/web/base/report/update.html
+++ b/templates/web/base/report/update.html
@@ -9,15 +9,15 @@
           [% IF moderating; original_update = update.moderation_original_data %]
             <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]">
                 <input type="hidden" name="token" value="[% csrf_token %]">
-                <input type="button" class="btn js-moderate moderate-display" value="Moderate this update">
+                <input type="button" class="btn js-moderate moderate-display" value="[% loc('Moderate this update') %]">
                 <div class="moderate-edit">
                     <label><input type="checkbox" class="hide-document" name="update_hide">
-                    Hide update completely?</label>
+                    [% loc('Hide update completely?') %]</label>
                     <label><input type="checkbox" name="update_show_name" [% update.anonymous ? '' : 'checked' %]>
-                    Show name publicly?</label>
+                    [% loc('Show name publicly?') %]</label>
                     [% IF update.photo or original_update.photo %]
                         <label><input type="checkbox" name="update_show_photo" [% update.photo ? 'checked' : '' %]>
-                        Show Photo?</label>
+                        [% loc('Show Photo?') %]</label>
                     [% END %]
                 </div>
           [% END %]
@@ -37,7 +37,7 @@
                     <div class="moderate-edit">
                         [% IF update.text != original.detail %]
                         <label><input type="checkbox" name="update_revert_detail" class="revert-textarea">
-                        Revert to original</label>
+                        [% loc('Revert to original') %]</label>
                         [% END %]
                         <textarea class="form-control" name="update_detail">[% update.text | add_links %]</textarea>
                     </div>
@@ -46,7 +46,7 @@
                     <p class="meta-2">
                         [% INCLUDE meta_line %]
                         [% mlog = update.latest_moderation_log_entry(); IF mlog %]
-                            <br /> Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %]
+                            <br />[% tprintf(loc('Moderated by %s at %s'), mlog.admin_user, prettify_dt(mlog.whenedited)) %]
                         [% END %]
                     </p>
                 </div>
@@ -54,11 +54,11 @@
             </div>
             [% IF moderating %]
                 <div class="moderate-edit">
-                    <label for="moderation_reason">Moderation reason:</label>
+                    <label for="moderation_reason">[% loc('Moderation reason:') %]</label>
                     <input type="text" class="form-control" name="moderation_reason"
-                        placeholder="Describe why you are moderating this">
-                    <input type="submit" class="red-btn" value="Save changes">
-                    <input type="button" class="btn cancel" value="Discard changes">
+                        placeholder="[% loc('Describe why you are moderating this') %]">
+                    <input type="submit" class="red-btn" value="[% loc('Save changes') %]">
+                    <input type="button" class="btn cancel" value="[% loc('Discard changes') %]">
                 </div>
                 </form>
             [% END %]
diff --git a/templates/web/base/report/update/form_user_loggedout.html b/templates/web/base/report/update/form_user_loggedout.html
index fa26eb8f4..d9f67e06e 100644
--- a/templates/web/base/report/update/form_user_loggedout.html
+++ b/templates/web/base/report/update/form_user_loggedout.html
@@ -4,7 +4,7 @@
     <div class="form-box">
     <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook">
         <img alt="" src="/i/facebook-icon-32.png" width="17" height="32">
-        Log in with Facebook
+        [% loc('Log in with Facebook') %]
     </button>
     </div>
   [% END %]
@@ -12,7 +12,7 @@
     <div class="form-box">
     <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter">
         <img alt="" src="/i/twitter-icon-32.png" width="17" height="32">
-        Log in with Twitter
+        [% loc('Log in with Twitter') %]
     </button>
     </div>
   [% END %]
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index e92395661..a4bab095e 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -669,7 +669,7 @@ $.extend(fixmystreet.set_up, {
   email_login_form: function() {
     // Log in with email button
     var email_form = $('#js-social-email-hide'),
-        button = $('<button class="btn btn--social btn--social-email">Log in with email</button>'),
+        button = $('<button class="btn btn--social btn--social-email">'+translation_strings.login_with_email+'</button>'),
         form_box = $('<div class="form-box"></div>');
     button.click(function(e) {
         e.preventDefault();
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 0fdad1279..e6e50d3e8 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -2,17 +2,27 @@ fixmystreet.offlineBanner = (function() {
     var toCache = 0;
     var cachedSoFar = 0;
 
+    // Extremely noddy function
+    function sprintf(s, p) {
+        return s.replace('%s', p);
+    }
+
+    // Note this non-global way of handling plurals may need looking at in future
     function formText() {
         var num = fixmystreet.offlineData.getForms().length;
-        return num + ' update' + (num===1 ? '' : 's');
+        if ( num === 1 ) {
+            return num + translation_strings.offline.update_single;
+        } else {
+            return num + translation_strings.offline.update_plural;
+        }
     }
 
     function onlineText() {
-        return 'You have <a id="oFN" href=""><span>' + formText() + '</span> saved to submit</a>.';
+        return sprintf(translation_strings.offline.saved_to_submit, formText());
     }
 
     function offlineText() {
-        return 'You are offline \u2013 <span>' + formText() + '</span> saved.';
+        return translation_strings.offline.you_are_offline + ' \u2013 ' + sprintf(translation_strings.offline.N_saved, formText());
     }
 
     function remove() {
@@ -87,12 +97,12 @@ fixmystreet.offlineBanner = (function() {
         startProgress: function(l) {
             $('.top_banner--offline').slideDown();
             toCache = l;
-            $('#offline_saving').html('Saving reports offline &ndash; <span>0</span>/' + toCache + '.');
+            $('#offline_saving').html(translation_strings.offline.saving_reports + ' &ndash; <span>0</span>/' + toCache + '.');
         },
         progress: function() {
             cachedSoFar += 1;
             if (cachedSoFar === toCache) {
-                $('#offline_saving').text('Reports saved offline.');
+                $('#offline_saving').text(translation_strings.offline.reports_saved);
                 window.setTimeout(remove, 3000);
             } else {
                 $('#offline_saving span').text(cachedSoFar);
@@ -367,10 +377,10 @@ if ($('#offline_list').length) {
     if (!success) {
         var html = localStorage.getItem('/my/planned');
         if (html) {
-            $('#offline_list').before('<h2>Your offline reports</h2>');
+            $('#offline_list').before('<h2>'+translation_strings.offline.your_reports+'</h2>');
             $('#offline_list').html(html);
             if (location.search.indexOf('saved=1') > 0) {
-                $('#offline_list').before('<p class="form-success">Your update has been saved offline for submission when back online.</p>');
+                $('#offline_list').before('<p class="form-success">'+translation_strings.offline.update_saved+'</p>');
             }
             fixmystreet.offline.replaceImages('#offline_list img');
             var offlineForms = fixmystreet.offlineData.getForms();
@@ -380,16 +390,16 @@ if ($('#offline_list').length) {
             });
             $('#offline_list a').each(function(i, a) {
                 if (savedForms[a.href]) {
-                    $(this).find('h3').prepend('<em>Offline update data saved</em> ');
+                    $(this).find('h3').prepend('<em>'+translation_strings.offline.update_data_saved+'</em> ');
                 }
             });
-            $('#offline_clear').css('margin-top', '5em').html('<button id="js-clear-localStorage">Clear offline data</button>');
+            $('#offline_clear').css('margin-top', '5em').html('<button id="js-clear-localStorage">'+translation_strings.offline.clear_data+'</button>');
             $('#js-clear-localStorage').click(function() {
-                if (window.confirm("Are you sure?")) {
+                if (window.confirm(translation_strings.offline.are_you_sure)) {
                     fixmystreet.offline.removeReports(fixmystreet.offlineData.getCachedUrls());
                     fixmystreet.offlineData.clearForms();
                     localStorage.removeItem('/my/planned');
-                    alert('Offline data cleared');
+                    alert(translation_strings.offline.data_cleared);
                 }
             });
         }
-- 
cgit v1.2.3


From 7032edb7a72758086fcaa3e3d0b198a163cf043c Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Thu, 16 Mar 2017 10:15:38 -0400
Subject: Update translations

This commit updates the contents of the es_DO translation,
and adds new strings ready for translation to the other translation files.
---
 locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po    | 924 +++++++++++++++++-------
 locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po | 890 ++++++++++++++++-------
 locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po | 896 +++++++++++++++++-------
 locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po    | 899 +++++++++++++++++-------
 locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po | 894 +++++++++++++++++-------
 locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 885 ++++++++++++++++-------
 locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 894 +++++++++++++++++-------
 locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po | 895 +++++++++++++++++-------
 locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po    | 894 +++++++++++++++++-------
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 970 ++++++++++++++++++--------
 locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 907 +++++++++++++++++-------
 locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 857 ++++++++++++++++-------
 locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po    | 889 ++++++++++++++++-------
 locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po    | 885 ++++++++++++++++-------
 locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po | 874 ++++++++++++++++-------
 locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po    | 879 ++++++++++++++++-------
 locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po | 878 ++++++++++++++++-------
 locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 900 +++++++++++++++++-------
 locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po | 887 ++++++++++++++++-------
 locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 883 ++++++++++++++++-------
 locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po    | 887 ++++++++++++++++-------
 locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 870 ++++++++++++++++-------
 locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po    | 907 +++++++++++++++++-------
 locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po    | 907 +++++++++++++++++-------
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 907 +++++++++++++++++-------
 locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po | 889 ++++++++++++++++-------
 locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po | 896 +++++++++++++++++-------
 locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po    | 889 ++++++++++++++++-------
 28 files changed, 18220 insertions(+), 6812 deletions(-)

diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9825fd7ae..c00934152 100644
--- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ar.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "و"
 
@@ -114,11 +114,11 @@ msgstr ""
 "لذلك سيظهر في كلا تنبيهي المجلس المحلي، ولكن سيظهر فقط في تنبيه \"ضمن الحدود\"\n"
 "للمجلس البلدي."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "دائرة %s، %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s، ضمن دائرة %s"
 
@@ -166,7 +166,7 @@ msgstr "(تم الإصلاح)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "( مثل الكتابة على الجدران ، رمي النفايات في الاماكن الغير مخصصة ، بلاطات ارصفة مكسورة او انارة الشوارع)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(لم ترسل الى الجهة المسئولة)"
 
@@ -174,17 +174,17 @@ msgstr "(لم ترسل الى الجهة المسئولة)"
 msgid "(optional)"
 msgstr "(إختياري)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(أرسل لكليهما)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "--إختر تصنيف--"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- إختر نوع العقار--"
 
@@ -196,6 +196,14 @@ msgstr "-اختر قالب---"
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -207,12 +215,20 @@ msgstr ""
 "              هذا هو السبب المرجح وراء كون \"منطقة التغطية\" فارغة (أدناه).<br>\n"
 "              هل تريد إضافة بعض <code>MAPIT_TYPES</code> إلى ملف التكوين؟"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">إظهار</label> %s <label for=\"filter_categories\">عن</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -231,11 +247,11 @@ msgstr "<strong>لا</strong> دعني أؤكّد تحديثي بالبريد"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>لا</strong> دعني أسجّل دخولي بالبريد"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -247,6 +263,8 @@ msgstr "<strong>نعم</strong> لدي كلمة المرور"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -292,15 +310,15 @@ msgstr ""
 msgid "Add user"
 msgstr "إضافة مستخدم"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "اضف/عدل أولويات الاستجابة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "اضف/عدل قوالب الاستجابة"
 
@@ -312,6 +330,10 @@ msgstr "أُضيف %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "مرة اخرى:"
@@ -328,6 +350,13 @@ msgstr "التحذير %d ألغي تفعيله (أنشيء %s)"
 msgid "Alert me to future updates"
 msgstr "نبهني بأحدث المستجدات"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "الكل"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -337,12 +366,14 @@ msgstr "كل التقارير"
 msgid "All Reports as CSV"
 msgstr "جميع التقارير بتنسيق CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "كل التصنيفات"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -377,11 +408,12 @@ msgstr "مستخدم اخر"
 msgid "Are you a developer?"
 msgstr "هل انت مطور ؟"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "هل أنت متأكد؟"
@@ -418,7 +450,7 @@ msgstr "تعيين إلى هيئة خارجية:"
 msgid "Assign to subdivision:"
 msgstr "تعيين إلى قسم فرعي:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -444,15 +476,23 @@ msgid "Auto-response:"
 msgstr "الإستجابة الآلية:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "التصنيفات المتاحة"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr "تفادى المعلومات الشخصية ولوحات السيارات"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "في إنتظار المشرفين"
@@ -470,7 +510,7 @@ msgid "Ban email address"
 msgstr "حظر البريد الإلكتروني"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -479,7 +519,7 @@ msgid "Bodies"
 msgstr "الهيئات"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -507,14 +547,15 @@ msgid "Categories"
 msgstr "تصنيفات"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "تصنيفات:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -525,7 +566,7 @@ msgstr "تصنيفات:"
 msgid "Category"
 msgstr "تصنيف"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’"
 
@@ -535,6 +576,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -542,7 +584,7 @@ msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عل
 msgid "Category:"
 msgstr "تصنيف:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "تصنيف: %s"
 
@@ -608,10 +650,14 @@ msgstr ""
 "اختر اسم <strong>تصنيف</strong> يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n"
 "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة."
 
-#: templates/web/base/report/_inspect.html:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -642,10 +688,12 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -653,11 +701,11 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري
 msgid "Closed"
 msgstr "مغلق"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "مغلق من الجهة المسئولة"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "التقارير المغلقة"
 
@@ -683,6 +731,11 @@ msgstr "بيانات العلامة التجارية المشتركة:"
 msgid "Cobrand:"
 msgstr "علامة تجارية مشتركة:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "تم استخدام الخريطة"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -746,8 +799,8 @@ msgstr "اتصل بفريق العمل"
 msgid "Coordinates:"
 msgstr "الإحداثيات:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "لم يتمكن من إيجاد المستخدم"
 
@@ -765,6 +818,36 @@ msgstr "المجلس"
 msgid "Council contacts for %s"
 msgstr "جهات اتصال المجلس لـ %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "عليه علامة مغلق"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "عليه علامة تم الإصلاح"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "عليه علامة قيد التقدم"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "عليه علامة جارٍ التحقق"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "عليه علامة مخطط"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "مرجع المجلس:&nbsp;%s"
@@ -789,15 +872,15 @@ msgstr "انشئ بلاغ"
 msgid "Create category"
 msgstr "انشء تصنيف"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "انشء أولوية"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -841,7 +924,11 @@ msgstr "صفحة المستخدم"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "تم التعامل بواسطة القسم الفرعي في غضون 5 أيام عمل"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -855,6 +942,11 @@ msgstr "حذف القالب"
 msgid "Deleted"
 msgstr "محذوف"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -891,6 +983,12 @@ msgstr "لم يتم استخدام الخريطة"
 msgid "Diligency prize league table"
 msgstr "جدول رابطة جائزة العناية بالدقة"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "حفظ التغييرات"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -916,23 +1014,25 @@ msgstr "هل تحب النماذج؟"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "اسحب الصور واسقطها هنا أو <u>انقر للرفع</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "مكرر"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "مكرر"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "مكرر"
@@ -948,8 +1048,8 @@ msgstr ""
 "يمكن للتصنيفات المختلفة أن <strong>تمتلك نفس عنوان الاتصال</strong> (عنوان بريد إلكتروني).\n"
 "هذا يعني أنه يمكنك إضافة ما تشاء من التصنيفات حتى ولو كنت تملك عنوان اتصال واحد للجهة المسئولة."
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -963,28 +1063,28 @@ msgid "Edit"
 msgstr "تعديل"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "تعديل تفاصيل الجهة المسئولة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "عدل تفاصيل المستخدمين الآخرين"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "عدل صلاحيات المستخدمين الآخرين"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "عدل تصنيف التقرير"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "عدل أولوية التقرير"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "عدل التقارير"
 
@@ -1023,7 +1123,7 @@ msgstr "المحرر"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "البريد أضيف إلى لائحة المسيئين"
 
@@ -1041,7 +1141,7 @@ msgstr "تم إنشاء الإخطار بالبريد"
 msgid "Email alert deleted"
 msgstr "تم حذف الإخطار بالبريد"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "البريد موجودا سابقا في لائحة المسيئين"
 
@@ -1093,7 +1193,7 @@ msgstr "نقطة النهاية"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "أدخل اسم شارع في زيورخ"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي"
 
@@ -1127,8 +1227,8 @@ msgstr "أدخل تفاصيل البلاغ"
 msgid "Error"
 msgstr "خطأ"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "الكل"
 
@@ -1142,14 +1242,23 @@ msgid "Examples:"
 msgstr "أمثلة:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "تصنيف موجود"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "وضح ما هي المشكلة"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "جميع التقارير بتنسيق CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1158,6 +1267,7 @@ msgid "Extern"
 msgstr "خارجي"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "معرف خارجي"
 
@@ -1178,8 +1288,8 @@ msgstr "فريق خارجي"
 msgid "Extra data:"
 msgstr "بيانات إضافية:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "تفاصيل إضافية"
 
@@ -1204,10 +1314,12 @@ msgstr "يمكن إصلاح ذلك عن طريق اختيار <strong>منطقة
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1215,6 +1327,8 @@ msgstr "تم الإصلاح"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "تم الإصلاح - المجلس"
 
@@ -1223,7 +1337,7 @@ msgstr "تم الإصلاح - المجلس"
 msgid "Fixed - User"
 msgstr "تم الإصلاح - المستخدم"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "التقارير التي تم إصلاحها"
 
@@ -1232,7 +1346,7 @@ msgid "Fixed:"
 msgstr "تم الإصلاح:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "مشار كمحذوف"
@@ -1318,11 +1432,13 @@ msgstr "أرسل لي موجز RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "سعيد لسماع أنها أصلحت!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "اذهب"
@@ -1331,11 +1447,11 @@ msgstr "اذهب"
 msgid "Going to send questionnaire?"
 msgstr "هل تريد أن ترسل سؤال؟"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "إعطاء تصريح للأدمن"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "الرسم البياني للإبلاغ عن المشكلات حسب الحالة مع مرور الوقت"
 
@@ -1351,7 +1467,7 @@ msgstr "هل أصلحت هذه المشكلة؟"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "هل أبلغت عن مشكلة لأحد المجالس من قبل، أم هذه هي المرة الأولى؟"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1376,6 +1492,9 @@ msgstr "مرحبا %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1383,6 +1502,11 @@ msgstr "مرحبا %s"
 msgid "Hidden"
 msgstr "مخفي"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "إعادة إرسال التقرير"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "أخفي القديم"
@@ -1391,6 +1515,10 @@ msgstr "أخفي القديم"
 msgid "Hide pins"
 msgstr "أخفي المثبتة"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "السجل"
@@ -1422,7 +1550,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1442,6 +1570,10 @@ msgstr ""
 "الرجاء تحديد <strong>عنصر رئيسي</strong> إذا كانت هذه الهيئة نفسها جزءًا من هيئة أخرى.\n"
 "          فيما يتعلق بالأنظمة الأساسية المثبتة، فإنك لا تحتاج إلى ضم الهيئات بهذه الطريقة."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1454,7 +1586,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1522,8 +1654,8 @@ msgstr "معرف غير صالح"
 msgid "Illegal feed selection"
 msgstr "اختيار موجز غير صالح"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1541,7 +1673,9 @@ msgstr "إضافة إلى ذلك، يتم إرجاع السمات التالية
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1559,7 +1693,7 @@ msgstr "تضمين البيانات الشخصية للمبلّغ"
 msgid "Include unconfirmed reports"
 msgstr "تضمين التقارير غير المؤكدة"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "قيمة has_photo غير صحيحة \"%s\""
 
@@ -1567,7 +1701,7 @@ msgstr "قيمة has_photo غير صحيحة \"%s\""
 msgid "Inspection required"
 msgstr "يتطلب المعاينة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "وجه المقاولون لإصلاح المشاكل"
 
@@ -1577,33 +1711,41 @@ msgstr "ملاحظات داخلية"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "إحالة داخلية"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "قيمة agency_responsible غير صالحة %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "تاريخ نهاية غير صالح"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "التنسيق المحدد %s غير صالح."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "تاريخ البداية غير صالح"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1634,6 +1776,15 @@ msgstr "الصلاحية القضائية غير معروفة"
 msgid "Keep me signed in on this computer"
 msgstr "احتفظ بتسجيل الدخول على هذا الكمبيوتر"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "آخر تحديث"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1647,11 +1798,12 @@ msgstr "آخر تحديث"
 msgid "Last&nbsp;update:"
 msgstr "آخر تحديث:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1659,6 +1811,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "اترك هذا خاليًا إذا كان سيتم إرسال جميع التقارير إلى هذه الهيئة باستخدام نفس أسلوب الإرسال (على سبيل المثال \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "عرض جميع المشكلات المبلّغ عنها"
@@ -1680,7 +1836,8 @@ msgstr "مواجز RSS وتنبيهات البريد الإلكتروني الم
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المحلية لـ ’%s‘"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "التنبيهات المحلية"
 
@@ -1688,15 +1845,36 @@ msgstr "التنبيهات المحلية"
 msgid "Locate the problem on a map of the area"
 msgstr "تحديد موقع المشكلة على خريطة المنطقة"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "الخريطة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1720,7 +1898,7 @@ msgstr "تحديد ما تم إصلاحه/إغلاقه خلال الأسابيع
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "تحديد ما تم إصلاحه/إغلاقه منذ أكثر من ثمانية أسابيع"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1740,7 +1918,7 @@ msgstr "رسالة إلى الهيئة الخارجية:"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr " jurisdiction_id غير موجود"
 
@@ -1748,7 +1926,7 @@ msgstr " jurisdiction_id غير موجود"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1756,15 +1934,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "تم الإبلاغ عنها بواسطة %s في %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "تم الإبلاغ عنها بواسطة %s في %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل واحد"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "مناطق أخرى:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "الشهر"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "الأكثر تعليقا"
 
@@ -1772,7 +1967,7 @@ msgstr "الأكثر تعليقا"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1800,7 +1995,7 @@ msgstr "الاسم:"
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1809,7 +2004,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "أقرب طريق مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)"
 
@@ -1818,7 +2013,7 @@ msgstr "أقرب رمز بريدي للدبوس الموضوع على الخري
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1900,7 +2095,7 @@ msgstr "حالة جديدة"
 msgid "New template"
 msgstr "قالب جديد"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "الأحدث"
 
@@ -1908,6 +2103,7 @@ msgstr "الأحدث"
 msgid "Next"
 msgstr "التالي"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1936,7 +2132,7 @@ msgstr "لا هيئة"
 msgid "No council"
 msgstr "لا مجلس"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "لم يتم تحديد مجلس"
 
@@ -1954,6 +2150,8 @@ msgstr "لم يتم العثور على مستخدمين مشار إليهم."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1964,6 +2162,14 @@ msgstr "يتعذر الإصلاح"
 msgid "No further updates"
 msgstr "لا توجد تحديثات إضافية"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "لم يتم إرجاع أي نتائج"
@@ -2010,6 +2216,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2071,6 +2279,14 @@ msgstr "الآن حان وقت تقديم التحديث&hellip;"
 msgid "OK"
 msgstr "موافق"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "المشكلات القديمة/غير <br>المعروفة"
@@ -2087,7 +2303,7 @@ msgstr "المشكلات القديمة التي تم <br>إصلاحها"
 msgid "Older <br>problems"
 msgstr "المشكلات <br>القديمة"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "الأقدم"
 
@@ -2097,7 +2313,10 @@ msgstr "الأقدم"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2141,15 +2360,15 @@ msgstr "أو المشكلات المبلغ عنها إلى:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "أو يمكنك الاشتراك للحصول على تنبيه تبعًا للإدارة أو المجلس الذي تتبعه:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "أخرى"
 
@@ -2184,11 +2403,11 @@ msgstr "كلمة المرور (اختياري)"
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "الارتباط الثابت"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "الصلاحيات:"
 
@@ -2255,8 +2474,8 @@ msgstr "وضع دبوس على الخريطة"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2282,14 +2501,14 @@ msgid "Please check your email address is correct"
 msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "الرجاء اختيار فئة"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "الرجاء اختيار نوع العقار"
 
@@ -2318,8 +2537,8 @@ msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة است
 msgid "Please enter a message"
 msgstr "الرجاء إدخال رسالة"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "الرجاء إدخال اسمك"
 
@@ -2334,13 +2553,13 @@ msgid "Please enter a password"
 msgstr "الرجاء إدخال كلمة مرور"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "الرجاء إدخال موضوع"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2353,7 +2572,7 @@ msgstr "الرجاء إدخال بريد إلكتروني صالح"
 msgid "Please enter a valid email address"
 msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "الرجاء إدخال بعض التفاصيل"
@@ -2380,14 +2599,14 @@ msgstr "الرجاء إدخال عنوان بريدك الإلكتروني"
 msgid "Please enter your first name"
 msgstr "الرجاء إدخال الاسم الأول"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2450,7 +2669,7 @@ msgstr "يرجى ملاحظة أن تحديثك <strong>لم يتم نشره ب
 msgid "Please note:"
 msgstr "الرجاء ملاحظة:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2483,10 +2702,10 @@ msgstr "الرجاء تحديد نوع التنبيه الذي تريده"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم حلها أم لا"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "الرجاء تحميل صورة فقط"
 
@@ -2509,15 +2728,15 @@ msgstr "نشر"
 msgid "Posted anonymously at %s"
 msgstr "نشر بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "تم النشر بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "تم النشر بواسطة <strong>%s</strong> (%s) في %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "تم النشر بواسطة <strong>%s</strong> في %s"
 
@@ -2533,12 +2752,12 @@ msgstr "السابق"
 msgid "Priorities"
 msgstr "أولويات"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "أولوية"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "الخصوصية"
 
@@ -2581,7 +2800,7 @@ msgstr "تم إرسال المشكلة %s إلى المجلس %s"
 msgid "Problem breakdown by state"
 msgstr "تصنيف المشكلة حسب الحالة"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "تم وضع علامة \"مفتوح\" على المشكلة."
 
@@ -2589,7 +2808,7 @@ msgstr "تم وضع علامة \"مفتوح\" على المشكلة."
 msgid "Problem state change based on survey results"
 msgstr "يتم تغيير حالة المشكلة حسب نتائج الاستطلاع"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "المشكلات"
@@ -2610,13 +2829,13 @@ msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet
 msgid "Problems within %.1fkm of this location"
 msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "المشكلات ضمن حدود %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "المشكلات ضمن حدود دائرة %s"
 
@@ -2662,7 +2881,7 @@ msgstr "الاستجابة العامة:"
 msgid "Public response:"
 msgstr "الاستجابة العامة:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2698,11 +2917,11 @@ msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن ا
 msgid "RSS feed"
 msgstr "موجز RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "موجز RSS لـ %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "موجز RSS لدائرة %s، %s"
 
@@ -2710,11 +2929,11 @@ msgstr "موجز RSS لدائرة %s، %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "موجز RSS لـ %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s"
 
@@ -2722,13 +2941,13 @@ msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s"
 msgid "RSS feed of nearby problems"
 msgstr "موجز RSS للمشكلات القريبة"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "موجز RSS للمشكلات الموجودة ضمن حدود %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "موجز RSS للمشكلات الموجودة ضمن حدود دائرة %s"
 
@@ -2747,7 +2966,7 @@ msgstr "موجز RSS للتحديثات على هذه المشكلة"
 msgid "Receive email when updates are left on this problem."
 msgstr "استلام بريد إلكتروني عند ترك تحديثات لهذه المشكلة."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr "استلمت من %s قبل لحظات"
 
@@ -2765,7 +2984,7 @@ msgstr "المشكلات التي تم <br>حلها مؤخرًا"
 msgid "Recently reported problems"
 msgstr "المشاكل المبلغة حديثا"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr "المحدثة مؤخرا"
 
@@ -2804,12 +3023,12 @@ msgid "Report"
 msgstr "إبلاغ"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "معرف البلاغ:"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "الإبلاغ عن مشكلة"
@@ -2827,6 +3046,11 @@ msgstr "بلغ كـ"
 msgid "Report on %s"
 msgstr "الإبلاغ على %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "بلغ كـ"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2838,7 +3062,7 @@ msgstr "الإبلاغ عن المشكلة"
 msgid "Report, view, or discuss local problems"
 msgstr "الإبلاغ عن المشكلات المحلية أو عرضها أو مناقشتها"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
@@ -2848,7 +3072,7 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s"
 msgid "Reported before"
 msgstr "تم الإبلاغ عنها من قبل"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s في %s"
@@ -2862,27 +3086,27 @@ msgstr "تم الإبلاغ عنها بواسطة:"
 msgid "Reported in the %s category"
 msgstr "تم الإبلاغ عنها في الفئة %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "تم البلاغ في التصنيف %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "تم الإبلاغ عنها بواسطة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s بواسطة %s في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بدون تحديد الهوية في %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بواسطة %s في %s"
 
@@ -2906,11 +3130,12 @@ msgstr "الإبلاغ عن مشكلة"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "التقارير"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "يقتصر طول التقارير على %s من الأحرف. الرجاء تقصير التقرير"
 
@@ -2918,10 +3143,6 @@ msgstr "يقتصر طول التقارير على %s من الأحرف. الرج
 msgid "Reports awaiting approval"
 msgstr "التقارير في انتظار الاعتماد"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2930,7 +3151,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "تم نشر التقارير"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "الإبلاغ عن مشكلة"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr "التقارير في انتظار الإرسال"
 
@@ -2942,10 +3168,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "إعادة إرسال التقرير"
@@ -2977,6 +3199,18 @@ msgstr "قوالب الاستجابة"
 msgid "Response Templates for %s"
 msgstr "قوالب الاستجابة لـ %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2992,15 +3226,15 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتق
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "تدوير لليسار"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3012,36 +3246,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغييرات غير المحفوظة في التقرير."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "القمر الصناعي"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "عليه علامة تقرير مكرر"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "حفظ التغييرات"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "البحث عن تقارير"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "البحث عن مستخدمين"
 
@@ -3068,7 +3310,7 @@ msgstr "لم يعثر البحث عن أي مستخدمين."
 msgid "See our privacy policy"
 msgstr "انظر سياسة الخصوصية"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3102,7 +3344,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "تمت إعادة إرسال التقرير"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "تم الإرسال إلى %s %s لاحقًا"
 
@@ -3115,7 +3357,7 @@ msgstr "تم الإرسال:"
 msgid "Service:"
 msgstr "الخدمة:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr "اضبط إلى موقعي الحالي"
 
@@ -3123,6 +3365,7 @@ msgstr "اضبط إلى موقعي الحالي"
 msgid "Share"
 msgstr "مشاركة"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3132,6 +3375,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3139,23 +3383,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "إظهار القديم"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "إظهار اسمي للعامة"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "إظهار اسمي للعامة"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "إظهار القديم"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "إظهار القديم"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "إظهار الدبابيس"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3197,7 +3461,7 @@ msgstr "بعض صور التقارير الحديثة"
 msgid "Some text to localize"
 msgstr "بعض النص لترجمته"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإحدى تبعيات التاج البريطاني، ونحن لا نغطي ذلك."
 
@@ -3228,15 +3492,21 @@ msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ 
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "عذرًا، لم نستطع تحليل ذلك الموقع. الرجاء إعادة المحاولة."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "عذرًا، لم نستطع حفظ الصورة (الصور)، الرجاء إعادة المحاولة."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr "للأسف، ليس لديك صلاحية لفعل ذلك."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr "رتب بواسطة"
 
@@ -3254,12 +3524,12 @@ msgstr "تاريخ البداية:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "الحالة"
@@ -3275,7 +3545,7 @@ msgstr "الحالة:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3296,7 +3566,7 @@ msgstr "لا تزال مفتوحة، عبر الاستبيان، %s"
 msgid "Street View"
 msgstr "عرض الشارع"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "الفئة الفرعية: %s"
 
@@ -3324,7 +3594,7 @@ msgstr "تقديم"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3381,11 +3651,11 @@ msgstr "ملخص"
 msgid "Summary reports"
 msgstr "ملخص التقارير"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3448,7 +3718,7 @@ msgstr "شكرًا لك على تحميل الصورة. نحن نحتاج الآ
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "شكرًا لك، يسعدنا معرفة أن المشكلة قد حُلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "يبدو أنه لم يتم تحميل هذه الصورة بصورة سليمة (%s)، الرجاء إعادة المحاولة."
 
@@ -3462,7 +3732,7 @@ msgstr "لا يبدو أن هذا الموقع يقع في المملكة الم
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا."
 
@@ -3630,7 +3900,7 @@ msgstr "حدثت مشكلة أثناء عرض صفحة \"كل التقارير\"
 msgid "There was a problem showing this page. Please try again later."
 msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء إعادة المحاولة لاحقًا."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3714,18 +3984,18 @@ msgstr ""
 "ستُرسل إلى هذه الهيئة تقارير المشكلات التي تقع في <strong>منطقة التغطية</strong> فقط.\n"
 "          لن تتلقى الهيئة أي تقارير ما لم تكن تغطي منطقة واحدة على الأقل."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr "أُرسلت رسالة البريد الإلكتروني إلى كلا المجلسين اللذين يغطيان موقع المشكلة، وبما أن المستخدم لم يحدد فئة المشكلة، فالرجاء تجاهلها إذا لم تكن المجلس المختص بمعالجة هذه المشكلة، أو أعلمنا بفئة المشكلة لنضيفها إلى النظام."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "هذه المعلومات مطلوبة"
 
@@ -3741,14 +4011,19 @@ msgstr "هذا ملخص لكل التقارير الموجودة على هذا 
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "تم إصلاح هذه المشكلة"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "لم يتم إصلاح هذه المشكلة"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "لم يتم إصلاح هذه المشكلة"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3796,7 +4071,7 @@ msgid "Tips for perfect photos"
 msgstr "نصائح لصور مثالية"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3827,8 +4102,26 @@ msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذ
 msgid "Total"
 msgstr "الإجمالي"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "عليه علامة تم الإصلاح"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr "هل يتطلب إدارة المرور؟"
 
@@ -3836,7 +4129,7 @@ msgstr "هل يتطلب إدارة المرور؟"
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3861,7 +4154,8 @@ msgstr "جرّب إرسال البريد الإلكتروني إلينا مبا
 msgid "Unconfirmed"
 msgstr "غير مؤكد"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "التقارير التي لم يتم إصلاحها"
 
@@ -3885,6 +4179,10 @@ msgstr "خطأ غير معروف"
 msgid "Unknown problem ID"
 msgstr "معرف المشكلة غير معروف"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3941,10 +4239,10 @@ msgstr "حالات التحديث"
 msgid "Updated"
 msgstr "تم التحديث"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3988,26 +4286,32 @@ msgstr "تم استخدام الخريطة"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "تمت إزالة إشارة المستخدم"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "تم وضع إشارة للمستخدم"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "عليه علامة تم الإصلاح"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "عثر البحث الذي نفذه المستخدم على مطابقات في أسماء المستخدمين وعناوين البريد الإلكتروني."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "المستخدمون"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4038,6 +4342,15 @@ msgstr "عرض موقع"
 msgid "Viewing a problem"
 msgstr "عرض مشكلة"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "دوائر هذا المجلس"
@@ -4057,7 +4370,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr "نحتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسفل."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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؛ ولكن لا توجد لدينا أي تفاصيل اتصال لهم. إذا كنت تعرف عنوان اتصال مناسبًا، فالرجاء التواصل معنا."
 
@@ -4074,6 +4387,10 @@ msgstr "لن نستخدم معلوماتك الشخصية إلا وفقًا <a h
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "سنعود إليك بأسرع ما يمكن."
@@ -4091,11 +4408,11 @@ msgstr "عند التحرير"
 msgid "When sent"
 msgstr "عند الإرسال"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4130,10 +4447,16 @@ msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قرا
 msgid "Wrong location? Just click again on the map."
 msgstr "موقع غير صحيح؟ انقر مرة أخرى على الخريطة."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "السنة"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4162,6 +4485,10 @@ msgstr "نعم لدي كلمة المرور"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشراف دون ضرورة لذلك:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبل:"
@@ -4208,6 +4535,10 @@ msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت ل
 msgid "You declined; please fill in the box above"
 msgstr "لقد رفضت؛ الرجاء تعبئة المربع بالأعلى"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4269,7 +4600,7 @@ msgid "Your Reports"
 msgstr "التقارير"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "حسابك"
 
@@ -4306,6 +4637,11 @@ msgstr "لن يتم استخدام معلوماتك إلا وفقًا <a href=\"
 msgid "Your name"
 msgstr "الاسم"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "التقارير"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4335,6 +4671,10 @@ msgstr "التقارير"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "التحديثات"
@@ -4345,7 +4685,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "الكل"
 
@@ -4353,7 +4693,7 @@ msgstr "الكل"
 msgid "by %s"
 msgstr "بواسطة %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "عليه علامة تقرير مكرر"
 
@@ -4381,49 +4721,49 @@ msgstr "تحرير المستخدم"
 msgid "from %s different users"
 msgstr "من %s من المستخدمين المختلفين"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "آخر تحديث %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "أقل من دقيقة واحدة"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "عليه علامة إجراء مجدول"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "عليه علامة إحالة داخلية"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "عليه علامة مغلق"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "عليه علامة تم الإصلاح"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "عليه علامة قيد التقدم"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "عليه علامة جارٍ التحقق"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "عليه علامة يتعذر الإصلاح"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "عليه علامة ليست مسؤولية المجلس"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "عليه علامة مخطط"
 
@@ -4434,7 +4774,7 @@ msgid "n/a"
 msgstr "غير متاح"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4469,8 +4809,8 @@ msgstr "المُدخل في الأصل: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "مناطق أخرى:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "تمت إعادة الفتح"
 
@@ -4491,7 +4831,7 @@ msgstr "المجلس المحلي"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يستخدم الخريطة"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "هذا النوع من المشكلة المحلية"
 
@@ -4499,6 +4839,16 @@ msgstr "هذا النوع من المشكلة المحلية"
 msgid "today"
 msgstr "اليوم"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "تحديث"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "التحديثات"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "تم استخدام الخريطة"
@@ -4516,7 +4866,18 @@ msgstr "المستخدم هو صاحب المشكلة"
 msgid "ward"
 msgstr "الإدارة"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "البريد الإلكتروني"
+msgstr[1] "البريد الإلكتروني"
+msgstr[2] "البريد الإلكتروني"
+msgstr[3] "البريد الإلكتروني"
+msgstr[4] "البريد الإلكتروني"
+msgstr[5] "البريد الإلكتروني"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4527,7 +4888,7 @@ msgstr[3] "%d من الأيام"
 msgstr[4] "%d من الأيام"
 msgstr[5] "%d من الأيام"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4538,7 +4899,7 @@ msgstr[3] "%d من الساعات"
 msgstr[4] "%d من الساعات"
 msgstr[5] "%d من الساعات"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4549,6 +4910,17 @@ msgstr[3] "%d من الدقائق"
 msgstr[4] "%d من الدقائق"
 msgstr[5] "%d من الدقائق"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d دقيقة"
+msgstr[1] "%d دقيقة"
+msgstr[2] "%d من الدقائق"
+msgstr[3] "%d من الدقائق"
+msgstr[4] "%d من الدقائق"
+msgstr[5] "%d من الدقائق"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4560,7 +4932,7 @@ msgstr[3] "%d من الداعمين"
 msgstr[4] "%d من الداعمين"
 msgstr[5] "%d من الداعمين"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4571,6 +4943,17 @@ msgstr[3] "%d من الأسابيع"
 msgstr[4] "%d من الأسابيع"
 msgstr[5] "%d من الأسابيع"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4615,6 +4998,17 @@ msgstr[3] "<big>%s</big> من التحديثات على التقارير"
 msgstr[4] "<big>%s</big> من التحديثات على التقارير"
 msgstr[5] "<big>%s</big> من التحديثات على التقارير"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "تم الإبلاغ عنها بواسطة %s في %s"
+msgstr[1] "تم الإبلاغ عنها بواسطة %s في %s"
+msgstr[2] "تم الإبلاغ عنها بواسطة %s في %s"
+msgstr[3] "تم الإبلاغ عنها بواسطة %s في %s"
+msgstr[4] "تم الإبلاغ عنها بواسطة %s في %s"
+msgstr[5] "تم الإبلاغ عنها بواسطة %s في %s"
+
 #: 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."
@@ -4637,5 +5031,51 @@ msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي ت
 msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن."
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "آخر تحديث %s"
+msgstr[1] "آخر تحديث %s"
+msgstr[2] "آخر تحديث %s"
+msgstr[3] "آخر تحديث %s"
+msgstr[4] "آخر تحديث %s"
+msgstr[5] "آخر تحديث %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "إبلاغ"
+msgstr[1] "إبلاغ"
+msgstr[2] "إبلاغ"
+msgstr[3] "إبلاغ"
+msgstr[4] "إبلاغ"
+msgstr[5] "إبلاغ"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "كل التصنيفات"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "معرف خارجي"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "يتطلب المعاينة"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "عدل تصنيف التقرير"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "تم الإبلاغ عنها بواسطة %s في %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "آخر تحديث %s"
+
 #~ msgid "Cancel"
 #~ msgstr "إلغاء"
diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
index de86cfcfd..b5c81d77f 100644
--- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/bg_BG.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "и"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s квартал, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, в %s квартал"
 
@@ -154,7 +154,7 @@ msgstr "(поправен)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(като графити, дупки по улицата, счупено улично осветление)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(не е изпратен към общината)"
 
@@ -162,17 +162,17 @@ msgstr "(не е изпратен към общината)"
 msgid "(optional)"
 msgstr "(незадължително)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(изпратен към двата района)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Изберете категория --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Изберете подходящ тип --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>Не</strong> Нека потвърдя актуализация
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Не</strong> Нека да вляза в системата чрез имейл"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Да</strong> Имам парола"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,15 +295,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Добавете потребител"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -297,6 +315,10 @@ msgstr "Добавено %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Отново:"
@@ -313,6 +335,12 @@ msgstr "Известието %d е изключено (създадено на %
 msgid "Alert me to future updates"
 msgstr "Известявай ме за бъдещи актуализиации"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -322,12 +350,14 @@ msgstr "Вички сигнали"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -362,11 +392,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Ако сте програмист?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -403,7 +434,7 @@ msgstr "Прехвърляне към външна община:"
 msgid "Assign to subdivision:"
 msgstr "Прехвърляне към подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -429,15 +460,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Очакващ преглед"
@@ -455,7 +494,7 @@ msgid "Ban email address"
 msgstr "Забрана на имейл адреса"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -464,7 +503,7 @@ msgid "Bodies"
 msgstr "Райони"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -492,14 +531,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -510,7 +550,7 @@ msgstr ""
 msgid "Category"
 msgstr "Категория"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -520,6 +560,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Сигнали подадени преди повече от 4 седмици"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -527,7 +568,7 @@ msgstr "Сигнали подадени преди повече от 4 седм
 msgid "Category:"
 msgstr "Категория:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Категория: %s"
 
@@ -591,10 +632,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -625,10 +670,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -636,11 +683,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Затворен"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Затворен от общината"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -666,6 +713,11 @@ msgstr "Информация за местната имплементция:"
 msgid "Cobrand:"
 msgstr "Местна имплементция"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "използвана е била картата"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -729,8 +781,8 @@ msgstr "Връзка с тима"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Потребителят не е намерен"
 
@@ -748,6 +800,36 @@ msgstr "Община"
 msgid "Council contacts for %s"
 msgstr "Контакти на общината за %s "
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "маркиран като \"затворен\""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "маркиран като \"поправен\""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "маркиран като \"в процес на обработка\""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "маркиран като \"проучва се\""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "маркиран като \"планиран\""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "входящ номер в общината:&nbsp;%s"
@@ -772,15 +854,15 @@ msgstr "Подай сигнал"
 msgid "Create category"
 msgstr "Създай категория"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -824,7 +906,11 @@ msgstr "Табло"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -838,6 +924,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Изтрит"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -874,6 +965,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Таблица с районите в София"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Запази промените"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -899,23 +996,25 @@ msgstr "Не обичате форми?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Вече съществува"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Вече съществува"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Вече съществува"
@@ -932,8 +1031,8 @@ msgstr ""
 "(имейл адрес). Това означава, че можете да добавяте различни категории, \n"
 "дори и да имате само един контакт."
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -947,28 +1046,28 @@ msgid "Edit"
 msgstr "Редактиране"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Редактиране на информацията за района"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1007,7 +1106,7 @@ msgstr "Редактирано от"
 msgid "Email"
 msgstr "Имейл"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Имейлът е добавен в списъка със злоупотреби"
 
@@ -1025,7 +1124,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Имейлът е в списъка със злоупотреби"
 
@@ -1070,7 +1169,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1104,8 +1203,8 @@ msgstr "Въведете информация за проблема"
 msgid "Error"
 msgstr "Грешка"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1119,14 +1218,22 @@ msgid "Examples:"
 msgstr "Примери:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1135,6 +1242,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1155,8 +1263,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Допълнителни данни:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1181,10 +1289,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1192,6 +1302,8 @@ msgstr "Поправено"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Поправени - община"
 
@@ -1200,7 +1312,7 @@ msgstr "Поправени - община"
 msgid "Fixed - User"
 msgstr "Поправени - потребител"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1209,7 +1321,7 @@ msgid "Fixed:"
 msgstr "Поправени:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Означен като \"изтрит\""
@@ -1295,11 +1407,13 @@ msgstr "Изтегляне на RSS емисии"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Търси"
@@ -1308,11 +1422,11 @@ msgstr "Търси"
 msgid "Going to send questionnaire?"
 msgstr "Ще изпратите ли анкетата?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Графика на създадените сигнали по статус във времето"
 
@@ -1330,7 +1444,7 @@ msgstr ""
 "Подавали ли сте сигнал за нередност към общината преди или сега \n"
 "подавате за първи път?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1355,6 +1469,9 @@ msgstr "Здравей %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1362,6 +1479,11 @@ msgstr "Здравей %s"
 msgid "Hidden"
 msgstr "Скрити"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Препращане на сигнал"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Скрий старите"
@@ -1370,6 +1492,10 @@ msgstr "Скрий старите"
 msgid "Hide pins"
 msgstr "Скрий кабърчетата"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "История"
@@ -1401,7 +1527,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1419,6 +1545,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1429,7 +1559,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1487,8 +1617,8 @@ msgstr "Несъществуващ номер"
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1506,7 +1636,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1524,7 +1656,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Включи непотвърдените сигнали"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1532,7 +1664,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1542,33 +1674,41 @@ msgstr "Вътрешни бележки"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Вътрешен номер"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Невярна дата"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Невярна дата"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1599,6 +1739,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Запомни ме"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Последно обновено:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1612,11 +1761,12 @@ msgstr "Последно обновено:"
 msgid "Last&nbsp;update:"
 msgstr "Последно обновено:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1624,6 +1774,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Показване на всички сигнали"
@@ -1645,7 +1799,8 @@ msgstr "RSS и имейл известия за сигнали"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "RSS и имейл известия за сигнали за  ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Известия"
 
@@ -1653,15 +1808,36 @@ msgstr "Известия"
 msgid "Locate the problem on a map of the area"
 msgstr "Локализирайте проблема на картата"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "Карта"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1685,7 +1861,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1705,7 +1881,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Липсващо jurisdiction_id"
 
@@ -1713,7 +1889,7 @@ msgstr "Липсващо jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1721,15 +1897,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Публикувано от %s в %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Публикувано от %s в %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "други територии:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Месец"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1737,7 +1930,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1765,7 +1958,7 @@ msgstr "Име:"
 msgid "Name: %s"
 msgstr "Име: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1774,7 +1967,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1783,7 +1976,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1865,7 +2058,7 @@ msgstr "Ново състояние"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1873,6 +2066,7 @@ msgstr ""
 msgid "Next"
 msgstr "Слеващ"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1901,7 +2095,7 @@ msgstr "Несъществуващ район"
 msgid "No council"
 msgstr "Несъществуваща община"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Не е избрана община"
 
@@ -1919,6 +2113,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1929,6 +2125,14 @@ msgstr ""
 msgid "No further updates"
 msgstr "Няма повече актуализации"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Няма намерени резултати"
@@ -1969,6 +2173,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2030,6 +2236,14 @@ msgstr "Изпратете актуализацията&hellip;"
 msgid "OK"
 msgstr "ОК"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Стари/Неидентифицирани <br>сигнали"
@@ -2046,7 +2260,7 @@ msgstr "Поправени преди<br>известно време"
 msgid "Older <br>problems"
 msgstr "Стари <br>сигнали"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2056,7 +2270,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2100,15 +2317,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Или можете да се абонирате за всички известия на територията на София или само за района, в който се намирате."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Други"
 
@@ -2143,11 +2360,11 @@ msgstr "Парола (незадължително)"
 msgid "Password:"
 msgstr "Парола:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Връзка"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2214,8 +2431,8 @@ msgstr "Поставете кабърче върху картата"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2241,14 +2458,14 @@ msgid "Please check your email address is correct"
 msgstr "Моля проверете дали сте въвели коректен имейл адрес"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Моля изберете категория"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2274,8 +2491,8 @@ msgstr "Моля не обиждайте никого - обиждайки Об
 msgid "Please enter a message"
 msgstr "Моля въведете съобщение"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2290,13 +2507,13 @@ msgid "Please enter a password"
 msgstr "Моля въведете парола"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Моля въведете тема"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2309,7 +2526,7 @@ msgstr "Моля въведете валиден имейл"
 msgid "Please enter a valid email address"
 msgstr "Моля въведете валиден имейл адрес"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Моля въведете информация"
@@ -2336,14 +2553,14 @@ msgstr "Моля въведете имейл адрес"
 msgid "Please enter your first name"
 msgstr "Моля въведете име"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2406,7 +2623,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Забележка:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2439,10 +2656,10 @@ msgstr "Моля изберете тип известия, които бихте
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Моля посочете дали проблемът е бил разрешен или не"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2465,15 +2682,15 @@ msgstr "Публикувай"
 msgid "Posted anonymously at %s"
 msgstr "Публикувано от анонимен потребител в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Публикувано от %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Публикувано от <strong>%s</strong> (%s) в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Публикувано от <strong>%s</strong> в %s"
 
@@ -2489,12 +2706,12 @@ msgstr "Предишно"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2537,7 +2754,7 @@ msgstr "Сигналът %s е подаден към общината %s "
 msgid "Problem breakdown by state"
 msgstr "Разделяне на сигналите по статуси"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Сигналът е маркиран като отворен."
 
@@ -2545,7 +2762,7 @@ msgstr "Сигналът е маркиран като отворен."
 msgid "Problem state change based on survey results"
 msgstr "Статусът на сигнала е променен на основата на резултат от анкета"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Сигнали"
@@ -2566,13 +2783,13 @@ msgstr "Проблеми сигнализирани скоро в сайта"
 msgid "Problems within %.1fkm of this location"
 msgstr "Сигнали в радиус от %.1fкм от това местоположение"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Сигнали в %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Сигнали в квартал %s"
 
@@ -2618,7 +2835,7 @@ msgstr "Публичен отговор:"
 msgid "Public response:"
 msgstr "Публичен отговор:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2654,11 +2871,11 @@ msgstr "Анкетата е попълнена от потребителя, по
 msgid "RSS feed"
 msgstr "RSS абонамент"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS абонамент за %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS абонамент за квартал %s, %s"
 
@@ -2666,11 +2883,11 @@ msgstr "RSS абонамент за квартал %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS абонамент за %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS абонамент за %s, в квартал %s"
 
@@ -2678,13 +2895,13 @@ msgstr "RSS абонамент за %s, в квартал %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS абонамент за последни проблеми наоколо"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS абонамент за проблеми в %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS абонамент за проблеми в квартал %s"
 
@@ -2703,7 +2920,7 @@ msgstr "RSS абонамент за актуализации по този пр
 msgid "Receive email when updates are left on this problem."
 msgstr "Получаване на имейл при актуализация на проблема."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2721,7 +2938,7 @@ msgstr "Наскоро <br>поправени"
 msgid "Recently reported problems"
 msgstr "Наскоро добавени сигнали"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2760,12 +2977,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Подайте сигнал"
@@ -2783,6 +3000,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Сигнал за %s "
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Сигнализирай за неподходящо съдържание"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2794,7 +3016,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сигнализирай, разгледай или коментирай проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2804,7 +3026,7 @@ msgstr ""
 msgid "Reported before"
 msgstr "Подавал съм и преди"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2818,27 +3040,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сигналът е подаден в категория %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сигналът е подаден в категория %s от %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s"
 
@@ -2862,11 +3084,12 @@ msgstr "Сигнализиране за проблем"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Сигнали"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2874,10 +3097,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr "Сигнали чакащи одобрение"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2886,7 +3105,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Публикувани сигнали"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Подайте сигнал"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2898,10 +3122,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Препращане на сигнал"
@@ -2933,6 +3153,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2948,15 +3180,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Завъртане наляво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2968,36 +3200,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "маркиран като \"повторен\""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Запази промените"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Търсене на Сигнали"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Търсене на Потребители"
 
@@ -3024,7 +3264,7 @@ msgstr "Не са намерени потребители."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3058,7 +3298,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Сигналът е подаден към %s преди %s"
 
@@ -3071,7 +3311,7 @@ msgstr "Изпратени:"
 msgid "Service:"
 msgstr "Услуга:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3079,6 +3319,7 @@ msgstr ""
 msgid "Share"
 msgstr "Сподели"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3088,6 +3329,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3095,23 +3337,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Показване на старите"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Показвай името  ми публично"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Показвай името  ми публично"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Показване на старите"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Показване на старите"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Покажи кабърчетата"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3151,7 +3413,7 @@ msgstr "Някои снимки от сигнали подадени наско
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3182,15 +3444,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3208,12 +3476,12 @@ msgstr "Начална дата:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
@@ -3229,7 +3497,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3250,7 +3518,7 @@ msgstr "Все още отворен, от анкета, %s "
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3278,7 +3546,7 @@ msgstr "Изпращане"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3335,11 +3603,11 @@ msgstr "Обобщение"
 msgid "Summary reports"
 msgstr "Обобщена справка"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3402,7 +3670,7 @@ msgstr "Благодаря за предоставената снимка. Тъ
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "Благодаря! Радваме се, че този проблем е бил разрешен! Бихме искли да Ви питаме подавали ли сте сигнали към общината и преди?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Прикачването на изображение е неуспешно (%s). Моля опитайте отново."
 
@@ -3416,7 +3684,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Моля да ни извините, този пощенски код не беше разпознат."
 
@@ -3574,7 +3842,7 @@ msgstr "Възникна проблем при визуализирането н
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Възникна проблем при визуализирането на страницата. Моля пробвайте по-късно."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3648,18 +3916,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr "Този имейл е изпратен към двете общини покриващи адреса на сигнала, тъй като потребителя не е го е категоризирал. Моля не го взимайте под внимание ако не сте правилната община, която е отговорна за този сигнал или ни съобщете под каква категория попада този сигнал, така че да може да я добавим в системата."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Тази информация е необходима"
 
@@ -3675,14 +3943,19 @@ msgstr "Това е обобщение на всички сигнали в са
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Този проблем е решен."
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Този проблем не е решен."
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Този проблем не е решен."
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3730,7 +4003,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3761,8 +4034,26 @@ msgstr "За да видите точното местоположение на
 msgid "Total"
 msgstr "Общо"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "маркиран като \"поправен\""
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3770,7 +4061,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3795,7 +4086,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Непотвърден"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3819,6 +4111,10 @@ msgstr "Непозната грешка"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3875,10 +4171,10 @@ msgstr "Актуализация  на статусите"
 msgid "Updated"
 msgstr "Актуализирано!"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3922,26 +4218,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "маркиран като \"поправен\""
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Потребители"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3972,6 +4274,15 @@ msgstr "Преглед на местоположение"
 msgid "Viewing a problem"
 msgstr "Преглед на сигнал"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3991,7 +4302,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -4008,6 +4319,10 @@ msgstr "Личните Ви данни ще бъдат използвани ед
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4025,11 +4340,11 @@ msgstr "Редактирано на:"
 msgid "When sent"
 msgstr "Изпратен"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4064,10 +4379,16 @@ msgstr "Моля пишете на кирилица! Писането само 
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Година"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4096,6 +4417,10 @@ msgstr "Да, имам парола"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4139,6 +4464,10 @@ msgstr "Можете да маркирате района или общинат
 msgid "You declined; please fill in the box above"
 msgstr "Вие отказахте; моля попълнете полето по-долу."
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4200,7 +4529,7 @@ msgid "Your Reports"
 msgstr "Вашите Сигнали"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4237,6 +4566,11 @@ msgstr "Вашата информация ще бъде използва сам
 msgid "Your name"
 msgstr "Име"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Вашите сигнали"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4266,6 +4600,10 @@ msgstr "Вашите сигнали"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Актуализации"
@@ -4276,7 +4614,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4284,7 +4622,7 @@ msgstr ""
 msgid "by %s"
 msgstr "от %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "маркиран като \"повторен\""
 
@@ -4312,49 +4650,49 @@ msgstr "редакция на потребителя"
 msgid "from %s different users"
 msgstr "от %s различни потребители"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Последно обновено  %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "преди по-малко от минута"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "маркиран като \"започнато е действие\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "маркиран като \"вътрешна референция\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "маркиран като \"затворен\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "маркиран като \"поправен\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "маркиран като \"в процес на обработка\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "маркиран като \"проучва се\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "марикарн като \"непоправим\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "маркиран като \"незадължение на Общината\""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "маркиран като \"планиран\""
 
@@ -4365,7 +4703,7 @@ msgid "n/a"
 msgstr "няма информация"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4400,8 +4738,8 @@ msgstr "първоначално въведен: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "други територии:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "отново отворен"
 
@@ -4422,7 +4760,7 @@ msgstr "местната община"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "мястото не е било отбелязано на картата от потребителя"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "този тип сигнали"
 
@@ -4430,6 +4768,16 @@ msgstr "този тип сигнали"
 msgid "today"
 msgstr "днес"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Актуализация"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Актуализации"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "използвана е била картата"
@@ -4447,27 +4795,41 @@ msgstr "потребителят е собственик на сигнала"
 msgid "ward"
 msgstr "квартал"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ден"
 msgstr[1] "%d дни"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
 msgstr[1] "%d часа"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
 msgstr[1] "%d минути"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d минута"
+msgstr[1] "%d минути"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4475,13 +4837,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d поддръжник"
 msgstr[1] "%d поддръжници"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d седмица"
 msgstr[1] "%d седмици"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4510,6 +4879,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big>актуализиран сигнал"
 msgstr[1] "<big>%s</big>актуализирани сигнала"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Сигналът е подаден в категория %s "
+msgstr[1] "Сигналът е подаден в категория %s "
+
 #: 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."
@@ -4523,3 +4899,33 @@ 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.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "Последно обновено  %s"
+msgstr[1] "Последно обновено  %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Сигнали"
+msgstr[1] "Сигнали"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Вички сигнали"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Създай категория"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Сигналът е подаден в категория %s "
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "Последно обновено  %s"
diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
index f4943dc0c..89362b75f 100644
--- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " a "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s, oddělení, %"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "% S, v% s oddělení"
 
@@ -154,7 +154,7 @@ msgstr "(vyřešeno)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích a pod. )"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(není odesláno na úřad)"
 
@@ -162,17 +162,17 @@ msgstr "(není odesláno na úřad)"
 msgid "(optional)"
 msgstr "(volitelně)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(odesláno dvoum??)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Vyberte kategorii --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Vyberte typ nemovitosti --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "              To je pravděpodobně proč je   \"area covered\" prázdná (níže).<br>\n"
 "             Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru."
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Ne</strong> Potvrdím aktualizaci e-mailem"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ne</strong> přihlásím se pomocí e-mailu"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -235,6 +251,8 @@ msgstr "<strong>Ano</strong>  Mám heslo"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -280,15 +298,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Přidat Uživatele"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -300,6 +318,10 @@ msgstr "Přidáno %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Opětovně:"
@@ -316,6 +338,12 @@ msgstr "Upozornění %d zrušeno (vytvořeno %s)"
 msgid "Alert me to future updates"
 msgstr "Upozorněte mě na budoucí aktualizace"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -325,12 +353,14 @@ msgstr "Všechna hlášení"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -365,11 +395,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Jste vývojář?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -406,7 +437,7 @@ msgstr "Přiřaďte externí instituci:"
 msgid "Assign to subdivision:"
 msgstr "Přiřaďte oddělení:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -432,15 +463,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Čeká se na moderování"
@@ -458,7 +497,7 @@ msgid "Ban email address"
 msgstr "Zakázat emailovou adresu"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -467,7 +506,7 @@ msgid "Bodies"
 msgstr "Subjekty"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -495,14 +534,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -513,7 +553,7 @@ msgstr ""
 msgid "Category"
 msgstr "Katetorie"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -523,6 +563,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Category fix rate for problems > 4 týdny staré"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -530,7 +571,7 @@ msgstr "Category fix rate for problems > 4 týdny staré"
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategorie: %s"
 
@@ -597,10 +638,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -631,10 +676,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -642,11 +689,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Uzavřena"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Uzavřena úřadem"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -672,6 +719,11 @@ msgstr "Data motivu:"
 msgid "Cobrand:"
 msgstr "Motiv:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "použitá mapa"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -735,8 +787,8 @@ msgstr "Kontaktujte nás!"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Uživatele nelze najít"
 
@@ -754,6 +806,36 @@ msgstr "Úřad"
 msgid "Council contacts for %s"
 msgstr "Kontakty na úřad %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "označeno za uzavřené"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "Označené jako vyřešené"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "označené jako probíhající"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "označené jako zkoumání"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "označené za naplánované"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "číslo jednací:&nbsp;%s"
@@ -778,15 +860,15 @@ msgstr "Vytvořit report"
 msgid "Create category"
 msgstr "Vytvořit kategorii"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -830,7 +912,11 @@ msgstr "Přehledy"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Odbavované úřadem  do 5 pracovních dnů"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -844,6 +930,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Smazána"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -880,6 +971,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Tabulka Vížěhů"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Uložit změny"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -905,23 +1002,25 @@ msgstr "Nechcete řešit formulářem?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicitní"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplicitní"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplicitní"
@@ -934,8 +1033,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -949,28 +1048,28 @@ msgid "Edit"
 msgstr "Upravit"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Editace podrobností subjektu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1009,7 +1108,7 @@ msgstr "Úprava"
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "E-mail přidán do seznamu zneužívání"
 
@@ -1027,7 +1126,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-mail je již v seznamu zneužívání"
 
@@ -1072,7 +1171,7 @@ msgstr "Endpoint"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Zadejte název ulice"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti"
 
@@ -1106,8 +1205,8 @@ msgstr "Uveďte podrobnosti daného problému"
 msgid "Error"
 msgstr "Chyba"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1121,14 +1220,22 @@ msgid "Examples:"
 msgstr "Příklady:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1137,6 +1244,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1157,8 +1265,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Doplňující data:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1183,10 +1291,12 @@ msgstr "Pro opravu vyberte <strong>oblast pokrytí</strong> v části <em>Editac
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1194,6 +1304,8 @@ msgstr "Vyřešené"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "vyřešené - Úřad"
 
@@ -1202,7 +1314,7 @@ msgstr "vyřešené - Úřad"
 msgid "Fixed - User"
 msgstr "Vyřešené - Uživatel"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1211,7 +1323,7 @@ msgid "Fixed:"
 msgstr "Vyřešené:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Označené za smazané"
@@ -1297,11 +1409,13 @@ msgstr "Přihlásit se k odběru RSS kanálu"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "OK"
@@ -1310,11 +1424,11 @@ msgstr "OK"
 msgid "Going to send questionnaire?"
 msgstr "Odeslat dotazník?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graf hlášení v čase a jejich stavů"
 
@@ -1330,7 +1444,7 @@ msgstr "Byl tento problém vyřešen?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Už jste někdy před tím  hlásili problém úřadu a nebo je toto Vaše hlášení poprvé?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1355,6 +1469,9 @@ msgstr "Přihlášená osoba: %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1362,6 +1479,11 @@ msgstr "Přihlášená osoba: %s"
 msgid "Hidden"
 msgstr "Skrytý"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Znovu odeslané hlášení"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Skrýt staré"
@@ -1370,6 +1492,10 @@ msgstr "Skrýt staré"
 msgid "Hide pins"
 msgstr "Schovat značky"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historie"
@@ -1401,7 +1527,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1421,6 +1547,10 @@ msgstr ""
 "Vyberte <strong>nadřízený subjekt</strong> pokud je subjekt součástí jiného subjektu.\n"
 "          Pro základní nastavení instalace nevyžaduje propojování subjektů tímto způsobem."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1433,7 +1563,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1494,8 +1624,8 @@ msgstr "Neplatné ID"
 msgid "Illegal feed selection"
 msgstr "Neplatný výběr zdoje"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1513,7 +1643,9 @@ msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open31
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1531,7 +1663,7 @@ msgstr "Zahrnuty osobní údaje hlasatele problému"
 msgid "Include unconfirmed reports"
 msgstr "Včetně nepotvrzených hlášení"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Chybná  has_photo hodnota \"%s\""
 
@@ -1539,7 +1671,7 @@ msgstr "Chybná  has_photo hodnota \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1549,33 +1681,41 @@ msgstr "Interní poznámky"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Interní postoupení"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Chybná agency_responsible hodnota %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Chybný konečný datum"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Chybný formát %s specified."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Chybné počáteční datum"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1606,6 +1746,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Ponechte mě přihlášeného na tomto počítači"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Poslední úpravy:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1619,11 +1768,12 @@ msgstr "Poslední úpravy:"
 msgid "Last&nbsp;update:"
 msgstr "Poslední úpravy:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1631,6 +1781,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Ponechte prázdné, pokud pro tento subjekt bude vždy použitá stejná metoda zasílání (např. \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Seznam všech hlášení"
@@ -1652,7 +1806,8 @@ msgstr "Lokální RSS kanály a mailové upozornění"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokální RSS kanály a mailové upozornění pro ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Místní upozornění"
 
@@ -1660,15 +1815,36 @@ msgstr "Místní upozornění"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokalizujte vaše hlášení v mapě"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAPA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1692,7 +1868,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1712,7 +1888,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Chybějící jurisdiction_id"
 
@@ -1720,7 +1896,7 @@ msgstr "Chybějící jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1728,15 +1904,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderováno oddělením během jednoho pracovního dne"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "ostatní oblasti:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Měsíc"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1744,7 +1937,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1772,7 +1965,7 @@ msgstr "Jméno:"
 msgid "Name: %s"
 msgstr "Jméno: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1781,7 +1974,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1790,7 +1983,7 @@ msgstr "Nejbližší PSČ k umístěné značce na mapě (automaticky generován
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1874,7 +2067,7 @@ msgstr "Nový stav"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1882,6 +2075,7 @@ msgstr ""
 msgid "Next"
 msgstr "Další"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1910,7 +2104,7 @@ msgstr "Žádný subjekt"
 msgid "No council"
 msgstr "Žádný Úřad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Není vybrán žádný úřad"
 
@@ -1928,6 +2122,8 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1938,6 +2134,14 @@ msgstr "Nelze opravit"
 msgid "No further updates"
 msgstr "Žádné další aktualizace"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Vráceno bez výsledku."
@@ -1984,6 +2188,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2045,6 +2251,14 @@ msgstr "A nyní pro odeslání aktualizace&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Staré / neznámé <br>hlášení"
@@ -2061,7 +2275,7 @@ msgstr "Starší <br>vyřešené"
 msgid "Older <br>problems"
 msgstr "Starší <br>hlášení"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2071,7 +2285,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2115,15 +2332,15 @@ msgstr "Nebo problémy hlášené subjektu:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Nebo se můžete přihlásit k odběru všech upozornění na hlášení, které jsou v následujících oblastech úřadu či částí:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Ostatní"
 
@@ -2158,11 +2375,11 @@ msgstr "Heslo (volitelně)"
 msgid "Password:"
 msgstr "Heslo:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Trvalý odkaz"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2229,8 +2446,8 @@ msgstr "Umísti špendlík na mapu"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2256,14 +2473,14 @@ msgid "Please check your email address is correct"
 msgstr "Zkontrolujte, zda je vaše emailová adresa správná"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vyberte kategorii"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Zvolte typ nemovitosti"
 
@@ -2289,8 +2506,8 @@ msgstr "Nezneužívejte tento nástroj - zneužívání vašeho úřadu znehodno
 msgid "Please enter a message"
 msgstr "prosím zadejte zprávu"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2305,13 +2522,13 @@ msgid "Please enter a password"
 msgstr "Prosím zadejte heslo"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Prosím zadejte název"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2324,7 +2541,7 @@ msgstr "Prosím zadejte platný e-mail"
 msgid "Please enter a valid email address"
 msgstr "Prosím zadejte platnou emailovou adresu"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Prosím zadejte podrobnosti"
@@ -2351,14 +2568,14 @@ msgstr "Prosím zadejte vaši emailovou adresu"
 msgid "Please enter your first name"
 msgstr "Zadejte vaše jméno"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2421,7 +2638,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Vezměte prosím na vědomí:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2454,10 +2671,10 @@ msgstr "Vyberte typ upozornění, které chcete"
 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"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2480,15 +2697,15 @@ msgstr "Odeslat"
 msgid "Posted anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Odesláno uživatelem  %s v %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 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:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Odesláno uživatelem <strong>%s</strong> v %s"
 
@@ -2504,12 +2721,12 @@ msgstr "Předcházející"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Ochrana osobních údajů"
 
@@ -2552,7 +2769,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:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Hlášení bylo označeno za otevřené."
 
@@ -2560,7 +2777,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Hlášení"
@@ -2581,13 +2798,13 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Hlášení v okolí %.1fkm od tohoto místa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Hlášení   v  oblasti  %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Hlášení v oblasti %s"
 
@@ -2633,7 +2850,7 @@ msgstr "Veřejná reakce:"
 msgid "Public response:"
 msgstr "Veřejná reakce:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2669,11 +2886,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:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS kanál pro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS kanál pro oblast  %s, %s"
 
@@ -2681,11 +2898,11 @@ msgstr "RSS kanál pro oblast  %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS kanál pro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS kanál pro  %s, v oblasti  %s "
 
@@ -2693,13 +2910,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS kanál hlášení v oblasti  %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS kanál hlášení v oblasti  %s "
 
@@ -2718,7 +2935,7 @@ msgstr "RSS kanál aktualizací tohoto hlášení"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2736,7 +2953,7 @@ msgstr "Aktuálně <br>vyřešené"
 msgid "Recently reported problems"
 msgstr "Nedávno nahlášené problémy"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2775,12 +2992,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Nahlásit problém"
@@ -2798,6 +3015,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Hlášení na webu %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Nevhodný obsah"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2809,7 +3031,7 @@ msgstr "Nahlášení problému"
 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:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Nahlášeno anonymně v %s"
@@ -2819,7 +3041,7 @@ msgstr "Nahlášeno anonymně v %s"
 msgid "Reported before"
 msgstr "Hlásil(a) jsem již dříve"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
@@ -2833,27 +3055,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Nahlášeno v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Nahlášeno anonymně v  %s v kategorii  %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Nahlášeno prostřednictvím %s anonymně v %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 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:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 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"
 
@@ -2877,11 +3099,12 @@ msgstr "Hlášení problému"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Hlášení"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hlášení"
 
@@ -2889,10 +3112,6 @@ msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hláš
 msgid "Reports awaiting approval"
 msgstr "Hlášení čekající na schválení"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2901,7 +3120,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Publikovaná hlášení"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Nahlásit problém"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2913,10 +3137,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Znovu odeslané hlášení"
@@ -2948,6 +3168,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2963,15 +3195,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2983,36 +3215,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satelitní"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "označené jako duplicitní hlášení"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Vyhledat hlášení"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Vyhledat uživatele"
 
@@ -3039,7 +3279,7 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3073,7 +3313,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "odesláno do %s o %s později"
 
@@ -3086,7 +3326,7 @@ msgstr "Odeslat:"
 msgid "Service:"
 msgstr "Služba:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3094,6 +3334,7 @@ msgstr ""
 msgid "Share"
 msgstr "Sdílet"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3103,6 +3344,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3110,23 +3352,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Zobrazit stará"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Zobrazit moje jméno veřejně"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Zobrazit moje jméno veřejně"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Zobrazit stará"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Zobrazit stará"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Zobrazit značky"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3166,7 +3428,7 @@ msgstr "Některé fotografie současných hlášení"
 msgid "Some text to localize"
 msgstr "Specifický název pro lokalizaci"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3197,15 +3459,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Omlouváme se,  nelze lokalizovat. Zkuste ještě jednou."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3223,12 +3491,12 @@ msgstr "Počáteční datum:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stav"
@@ -3244,7 +3512,7 @@ msgstr "Stav:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3265,7 +3533,7 @@ msgstr "Stále otevřeno, prostřednictvím dotazníku,  %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Podkategorie: %s"
 
@@ -3293,7 +3561,7 @@ msgstr "Odeslat"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3350,11 +3618,11 @@ msgstr "Přehled"
 msgid "Summary reports"
 msgstr "Souhrnný přehled"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3417,7 +3685,7 @@ msgstr "Děkujeme za nahrání fotografie. Nyní je třeba lokalizovat Vaše hl
 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 "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?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím znovu."
 
@@ -3431,7 +3699,7 @@ msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Omlouváme se, ale poštovní směrovací číslo nebylo rozpoznáno."
 
@@ -3595,7 +3863,7 @@ msgstr "Nastal problém v zobrazení stránky Všechna hlášení. Prosím, zkus
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3679,18 +3947,18 @@ msgstr ""
 "Tomuto úřadu budou zasálána pouze hlášení o problémech, která jsou umístěna v <strong> oblasti pokrytí</strong>. \n"
 "          Úřad nebude dostávat žádné zprávy, pokud nepokrývá alespoň jednu vybranou oblast."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě, protože uživatel hlášení nekategorizoval. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém nebo nám dejte vědět, jaká je to kategorie problémů a kdo jí má na starosti, my jí doplníme do našeho systému."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Tato informace je vyžadována"
 
@@ -3706,14 +3974,19 @@ msgstr "Zde je souhrn všech hlášení na tomto webu."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Hlášení bylo vyřešeno"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Hlášení nemohlo být vyřešeno"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Hlášení nemohlo být vyřešeno"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3761,7 +4034,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3792,8 +4065,26 @@ msgstr "Pro  zobrazení mapy přesného umístění tohoto problému"
 msgid "Total"
 msgstr "Celkem"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "Označené jako vyřešené"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3801,7 +4092,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3826,7 +4117,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Nepotvrzeno"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3850,6 +4142,10 @@ msgstr "Neznámá chyba"
 msgid "Unknown problem ID"
 msgstr "Neznámé ID hlášení"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3906,10 +4202,10 @@ msgstr "Aktualizovat status"
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3953,26 +4249,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Uživatel vyjmut ze sledování"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Uživatel sledován"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "Označené jako vyřešené"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Při vyhledávání byly nalezeny shody  v uživatelských jménech nebo e-mailových adresách."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Uživatelé"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4003,6 +4305,15 @@ msgstr "Zobrazení oblastí"
 msgid "Viewing a problem"
 msgstr "Zobrazení hlášení"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Oddělení tohoto úřadu"
@@ -4022,7 +4333,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Uvědomujeme si, že za tento  problém by mohl být odpovědný % s; Nicméně, nemáme na ně v současné době žádné kontaktní údaje. Pokud příslušné kontakty znáte, sem s nimi. "
 
@@ -4039,6 +4350,10 @@ msgstr "Osobní údaje budeme používat pouze v souladu s našimi <a href=\"/pr
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4056,11 +4371,11 @@ msgstr "Editováno:"
 msgid "When sent"
 msgstr "Odesláno:"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4095,10 +4410,16 @@ msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako
 msgid "Wrong location? Just click again on the map."
 msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Rok"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4127,6 +4448,10 @@ msgstr "Ano mám heslo"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Stěžujete si, že toto hlášení bylo bezdůvodně moderováno:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Upozornění na níže uvedené hlášení, které může být urážlivé, obsahující osobní údaje či jiné nevhodné vyjádření."
@@ -4172,6 +4497,10 @@ msgstr "Pokud nechcete, aby byl subjekt dále na serveru aktivní, můžete ho o
 msgid "You declined; please fill in the box above"
 msgstr "Odmítnuto; vyplňte rámeček nahoře"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4233,7 +4562,7 @@ msgid "Your Reports"
 msgstr "Vaše hlášení"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4270,6 +4599,11 @@ msgstr "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"
 msgid "Your name"
 msgstr "Vaše jméno a příjmení"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Vaše hlášení"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4299,6 +4633,10 @@ msgstr "Vaše hlášení"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Vaše aktualizace"
@@ -4309,7 +4647,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4317,7 +4655,7 @@ msgstr ""
 msgid "by %s"
 msgstr "uživatelem  %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "označené jako duplicitní hlášení"
 
@@ -4345,49 +4683,49 @@ msgstr "editace uživatele"
 msgid "from %s different users"
 msgstr "od %s různých uživatelů"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "naposledy upravené %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "méně než minutou"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "označené jako plánované"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "Označené jako interní postoupení"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "označeno za uzavřené"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "Označené jako vyřešené"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "označené jako probíhající"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "označené jako zkoumání"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "označené za nemožné spravit"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "označené za nespadající do kompetencí úřadu"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "označené za naplánované"
 
@@ -4398,7 +4736,7 @@ msgid "n/a"
 msgstr "neuvedeno"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4433,8 +4771,8 @@ msgstr "původně zadáno: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "ostatní oblasti:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "znovu otevřeno"
 
@@ -4455,7 +4793,7 @@ msgstr "místní úřad"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "V mapě se nenalézají žádné značky hlášení od uživatelů"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "tento typ lokálního problému"
 
@@ -4463,6 +4801,16 @@ msgstr "tento typ lokálního problému"
 msgid "today"
 msgstr "dnes"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Aktualizovat"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Aktualizace"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "použitá mapa"
@@ -4480,7 +4828,15 @@ msgstr "uživatel je vlastníkem hlášení"
 msgid "ward"
 msgstr "okrsek"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4488,7 +4844,7 @@ msgstr[0] "%d den"
 msgstr[1] "%d dny"
 msgstr[2] "%d dní"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4496,7 +4852,7 @@ msgstr[0] "%d hodina"
 msgstr[1] "%d hodiny"
 msgstr[2] "%d hodin"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4504,6 +4860,14 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minuty"
 msgstr[2] "%d minut"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4512,7 +4876,7 @@ msgstr[0] "%d podporovatel"
 msgstr[1] "%d podporovatelé"
 msgstr[2] "%d podporovatelů"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4520,6 +4884,14 @@ msgstr[0] "%d týden"
 msgstr[1] "%d týdny"
 msgstr[2] "%d týdnů"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4552,6 +4924,14 @@ msgstr[0] "<big>%s</big>aktualizované hlášení"
 msgstr[1] "<big>%s</big> aktalizovan hlášení"
 msgstr[2] "<big>%s</big> aktualizovaných hlášení"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Nahlášeno uživatelem  %s, určeno pro %s"
+msgstr[1] "Nahlášeno uživatelem  %s, určeno pro %s"
+msgstr[2] "Nahlášeno uživatelem  %s, určeno pro %s"
+
 #: 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."
@@ -4567,3 +4947,35 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu."
 msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
 msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "naposledy upravené %s"
+msgstr[1] "naposledy upravené %s"
+msgstr[2] "naposledy upravené %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Hlášení"
+msgstr[1] "Hlášení"
+msgstr[2] "Hlášení"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Všechna hlášení"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Vytvořit kategorii"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Nahlášeno uživatelem  %s, určeno pro %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "naposledy upravené %s"
diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
index 91efc9979..ff077cf0d 100644
--- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/cy.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "a"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "ward %s, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, o fewn ward %s"
 
@@ -154,7 +154,7 @@ msgstr "(wedi trwsio)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(heb ei anfon at y cyngor)"
 
@@ -162,17 +162,17 @@ msgstr "(heb ei anfon at y cyngor)"
 msgid "(optional)"
 msgstr "(dewisol)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(anfonwyd i'r ddau)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Dewiswch gategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Dewiswch fath o eiddo --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bo
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Oes</strong>, mae gen i gyfrinair"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "Ychwanegwyd %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Eto:"
@@ -310,6 +332,12 @@ msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)"
 msgid "Alert me to future updates"
 msgstr "Rhoi gwybod am ddiweddariadau i ddod"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Pob adroddiad"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Ydych chi'n ddatblygwr?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "Cyrff"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Categori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "Categori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categori: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Ar gau"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Caewyd gan y cyngor"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,10 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +768,8 @@ msgstr "Cysylltu â'r tîm"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Methu dod o hyd i'r defnyddiwr"
 
@@ -736,6 +787,32 @@ msgstr "Cyngor"
 msgid "Council contacts for %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "Mae'r adroddiad hwn wedi'i nodi ar gau."
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+msgid "Council has marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +837,15 @@ msgstr "Creu adroddiad"
 msgid "Create category"
 msgstr "Creu categori"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +889,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +907,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Dilëwyd"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +948,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Cadw'r newidiadau"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +979,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Lluosogi"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Lluosogi"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Lluosogi"
@@ -916,8 +1010,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1025,28 @@ msgid "Edit"
 msgstr "Golygu"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Golygu manylion y corff"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1085,7 @@ msgstr "Golygydd"
 msgid "Email"
 msgstr "E-bost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd"
 
@@ -1009,7 +1103,7 @@ msgstr "Crëwyd hysbysiad e-bost"
 msgid "Email alert deleted"
 msgstr "Dilëwyd hysbysiad e-bost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-bost eisoes yn y rhestr camddefnydd"
 
@@ -1054,7 +1148,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Rhowch god post DU, neu enw stryd ac ardal"
 
@@ -1088,8 +1182,8 @@ msgstr "Rhowch fanylion am y broblem"
 msgid "Error"
 msgstr "Gwall"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1103,14 +1197,22 @@ msgid "Examples:"
 msgstr "Enghraifft:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1221,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1242,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Data ychwanegol:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1268,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1281,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -1184,7 +1291,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1193,7 +1300,7 @@ msgid "Fixed:"
 msgstr ""
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1279,11 +1386,13 @@ msgstr "Derbyn ffrwd RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1292,11 +1401,11 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1312,7 +1421,7 @@ msgstr "Gafodd y broblem ei thrwsio?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tro cyntaf?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1446,9 @@ msgstr "Helo %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1456,11 @@ msgstr "Helo %s"
 msgid "Hidden"
 msgstr "Cudd"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Ailanfon adrodd"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Cuddio'r hen rai"
@@ -1352,6 +1469,10 @@ msgstr "Cuddio'r hen rai"
 msgid "Hide pins"
 msgstr "Cuddio'r piniau"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Hanes"
@@ -1383,7 +1504,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1522,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1536,7 @@ msgstr ""
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r wefan i adael diweddariad."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1594,8 @@ msgstr "ID annerbynniol"
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1613,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1633,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1641,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1651,41 @@ msgstr "Nodiadau mewnol"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Dyddiad dod i ben annilys"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Dyddiad cychwyn annilys"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1716,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Diweddariad diwethaf:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1738,12 @@ msgstr "Diweddariad diwethaf:"
 msgid "Last&nbsp;update:"
 msgstr "Diweddariad&nbsp;diwethaf:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1751,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Rhestru'r holl broblemau a adroddwyd"
@@ -1627,7 +1776,8 @@ msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost ar gyfer '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Hysbysiadau lleol"
 
@@ -1635,15 +1785,36 @@ msgstr "Hysbysiadau lleol"
 msgid "Locate the problem on a map of the area"
 msgstr "Lleoli'r broblem ar fap o'r ardal"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAP"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1838,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1858,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id coll"
 
@@ -1695,7 +1866,7 @@ msgstr "jurisdiction_id coll"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1874,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Adroddwyd gan %s am %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Adroddwyd gan %s am %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "ardaloedd eraill:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mis"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1907,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1935,7 @@ msgstr "Enw:"
 msgid "Name: %s"
 msgstr "Enw: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1944,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1953,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2035,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2043,7 @@ msgstr ""
 msgid "Next"
 msgstr "Nesaf"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2072,7 @@ msgstr "Dim corff"
 msgid "No council"
 msgstr "Dim cyngor"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr ""
 
@@ -1901,6 +2090,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2102,14 @@ msgstr "Methu trwsio"
 msgid "No further updates"
 msgstr "Dim diweddariadau pellach"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Dim canlyniadau"
@@ -1951,6 +2150,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2213,14 @@ msgstr "Nawr i gyflwyno eich diweddariad&hellip;"
 msgid "OK"
 msgstr "Iawn"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Problemau <br>hen/anhysbys"
@@ -2028,7 +2237,7 @@ msgstr "Trwsiwyd <br>o'r blaen"
 msgid "Older <br>problems"
 msgstr "Problemau <br>hŷn"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2247,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2294,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr ""
 
@@ -2125,11 +2337,11 @@ msgstr "Cyfrinair (dewisol)"
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Dolen barhaol"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2408,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2435,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2256,8 +2468,8 @@ msgstr "Peidiwch â bod yn sarhaus&nbsp;&mdash; byddai sarhau eich cyngor yn dib
 msgid "Please enter a message"
 msgstr "Rhowch neges"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2484,13 @@ msgid "Please enter a password"
 msgstr "Rhowch gyfrinair"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Rhowch bwnc"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2503,7 @@ msgstr "Rhowch e-bost dilys"
 msgid "Please enter a valid email address"
 msgstr "Rhowch gyfeiriad e-bost dilys"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Rhowch fanylion"
@@ -2318,14 +2530,14 @@ msgstr "Rhowch eich cyfeiriad e-bost"
 msgid "Please enter your first name"
 msgstr "Rhowch eich enw cyntaf"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2600,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Noder:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2633,10 @@ msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Dywedwch a gafodd y broblem ei thrwsio"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2659,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr "Postiwyd yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Postiwyd gan %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postiwyd gan <strong>%s</strong> (%s) am %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postiwyd gan <strong>%s</strong> am %s"
 
@@ -2471,12 +2683,12 @@ msgstr "Blaenorol"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Preifatrwydd"
 
@@ -2519,7 +2731,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor"
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2527,7 +2739,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemau"
@@ -2548,13 +2760,13 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemau yn %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemau yn ward %s"
 
@@ -2600,7 +2812,7 @@ msgstr "Ymateb cyhoeddus:"
 msgid "Public response:"
 msgstr "Ymateb cyhoeddus:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2636,11 +2848,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr "Ffrwd RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Ffrwd RSS ar gyfer %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Ffrwd RSS ar gyfer ward %s, %s"
 
@@ -2648,11 +2860,11 @@ msgstr "Ffrwd RSS ar gyfer ward %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Ffrwd RSS %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Ffrwd RSS %s, o fewn ward %s"
 
@@ -2660,13 +2872,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Ffrwd RSS  o broblemau yn %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Ffrwd RSS o broblemau o fewn ward %s"
 
@@ -2685,7 +2897,7 @@ msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2703,7 +2915,7 @@ msgstr "Trwsiwyd yn <br>ddiweddar"
 msgid "Recently reported problems"
 msgstr "Problemau a adroddwyd yn ddiweddar"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2742,12 +2954,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Adrodd problem"
@@ -2765,6 +2977,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Adroddwyd ar %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Adrodd camddefnydd"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2776,7 +2993,7 @@ msgstr "Adrodd eich problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Adrodd, gweld, neu drafod problemau lleol"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Adroddwyd yn ddienw am %s"
@@ -2786,7 +3003,7 @@ msgstr "Adroddwyd yn ddienw am %s"
 msgid "Reported before"
 msgstr "Adroddwyd eisoes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Adroddwyd gan %s am %s"
@@ -2800,27 +3017,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Adroddwyd yn y categori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 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:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Adroddwyd yn y categori %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Adroddwyd drwy %s yn ddienw am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Adroddwyd drwy %s gan %s am %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Adroddwyd drwy %s yn y categori %s am %s"
 
@@ -2844,11 +3061,12 @@ msgstr "Adrodd problem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Adroddiadau"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2856,10 +3074,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2868,7 +3082,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Adroddiadau a gyhoeddwyd"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Adrodd problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2880,10 +3099,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Ailanfon adrodd"
@@ -2915,6 +3130,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2930,15 +3157,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Cylchdroi i'r chwith"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2950,35 +3177,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Cadw'r newidiadau"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Chwilio am adroddiadau"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Chwilio am ddefnyddwyr"
 
@@ -3005,7 +3240,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3039,7 +3274,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3052,7 +3287,7 @@ msgstr "Anfonwyd:"
 msgid "Service:"
 msgstr "Gwasanaeth:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3060,6 +3295,7 @@ msgstr ""
 msgid "Share"
 msgstr "Rhannu"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3069,6 +3305,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3076,23 +3313,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Dangos yr hen rai"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Dangos fy enw yn gyhoeddus"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Dangos fy enw yn gyhoeddus"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Dangos yr hen rai"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Dangos yr hen rai"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Dangos piniau"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3132,7 +3389,7 @@ msgstr "Lluniau o adroddiadau diweddar"
 msgid "Some text to localize"
 msgstr "Testun i'w leoleiddio"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3163,15 +3420,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3189,12 +3452,12 @@ msgstr "Dyddiad cychwyn:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Cyflwr"
@@ -3210,7 +3473,7 @@ msgstr "Cyflwr:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3231,7 +3494,7 @@ msgstr "Ar agor o hyd, drwy holiadur, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Is-gategori: %s"
 
@@ -3259,7 +3522,7 @@ msgstr "Cyflwyno"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3316,11 +3579,11 @@ msgstr "Crynodeb"
 msgid "Summary reports"
 msgstr "Adroddiadau"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3383,7 +3646,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem
 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 "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto."
 
@@ -3397,7 +3660,7 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3553,7 +3816,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3627,18 +3890,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Mae'r wybodaeth hon yn ofynnol"
 
@@ -3654,14 +3917,19 @@ msgstr "Dyma grynodeb o'r holl adroddiadau ar y wefan hon."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Trwsiwyd y broblem hon"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Ni thrwsiwyd y broblem hon"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Ni thrwsiwyd y broblem hon"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3709,7 +3977,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3740,8 +4008,25 @@ msgstr ""
 msgid "Total"
 msgstr "Cyfanswm"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+msgid "Total marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3749,7 +4034,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3774,7 +4059,8 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:"
 msgid "Unconfirmed"
 msgstr "Heb ei gadarnhau"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3798,6 +4084,10 @@ msgstr "Gwall anhysbys"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3854,10 +4144,10 @@ msgstr ""
 msgid "Updated"
 msgstr "Diweddarwyd"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3901,26 +4191,31 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+msgid "User has marked as fixed"
+msgstr ""
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3951,6 +4246,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Wardiau'r cyngor hwn"
@@ -3970,7 +4274,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3987,6 +4291,10 @@ msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n  <a href=\"
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Ymatebwn cyn gynted â phosib."
@@ -4004,11 +4312,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4043,10 +4351,16 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano
 msgid "Wrong location? Just click again on the map."
 msgstr "Lleoliad anghywir? Cliciwch ar y map eto."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Blwyddyn"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4075,6 +4389,10 @@ msgstr "Oes, mae gen i gyfrinair"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4118,6 +4436,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Gwrthodoch chi; llenwch y blwch uchod"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4176,7 +4498,7 @@ msgid "Your Reports"
 msgstr "Eich adroddiadau"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4213,6 +4535,11 @@ msgstr ""
 msgid "Your name"
 msgstr "Eich enw"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Eich adroddiadau"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4242,6 +4569,10 @@ msgstr "Eich adroddiadau"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Eich diweddariadau"
@@ -4252,7 +4583,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4260,7 +4591,7 @@ msgstr ""
 msgid "by %s"
 msgstr "gan %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4288,49 +4619,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "diweddarwyd ddiwethaf %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "llai na munud"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4341,7 +4672,7 @@ msgid "n/a"
 msgstr "ddim yn berthnasol"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4376,8 +4707,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "ardaloedd eraill:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "ailagorwyd"
 
@@ -4398,7 +4729,7 @@ msgstr "y cyngor lleol"
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4406,6 +4737,16 @@ msgstr ""
 msgid "today"
 msgstr "heddiw"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Diweddarwyd"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Diweddariadau"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4423,7 +4764,16 @@ msgstr ""
 msgid "ward"
 msgstr "ward"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4432,7 +4782,7 @@ msgstr[1] "%d ddiwrnod"
 msgstr[2] "%d o ddiwrnodau"
 msgstr[3] "%d diwrnod"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4441,7 +4791,7 @@ msgstr[1] "%d awr"
 msgstr[2] "%d o oriau"
 msgstr[3] "%d awr"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4450,6 +4800,15 @@ msgstr[1] "%d funud"
 msgstr[2] "%d o funudau"
 msgstr[3] "%d munud"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d funud"
+msgstr[1] "%d funud"
+msgstr[2] "%d o funudau"
+msgstr[3] "%d munud"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4459,7 +4818,7 @@ msgstr[1] "%d gefnogwr"
 msgstr[2] "%d o gefnogwyr"
 msgstr[3] "%d cefnogwr"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4468,6 +4827,15 @@ msgstr[1] "%d wythnos"
 msgstr[2] "%d o wythnosau"
 msgstr[3] "%d wythnos"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4504,6 +4872,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Adroddwyd gan %s am %s"
+msgstr[1] "Adroddwyd gan %s am %s"
+msgstr[2] "Adroddwyd gan %s am %s"
+msgstr[3] "Adroddwyd gan %s am %s"
+
 #: 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."
@@ -4521,3 +4898,41 @@ msgstr[0] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
 msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
 msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn."
 msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "diweddarwyd ddiwethaf %s"
+msgstr[1] "diweddarwyd ddiwethaf %s"
+msgstr[2] "diweddarwyd ddiwethaf %s"
+msgstr[3] "diweddarwyd ddiwethaf %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Adroddiadau"
+msgstr[1] "Adroddiadau"
+msgstr[2] "Adroddiadau"
+msgstr[3] "Adroddiadau"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Pob adroddiad"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "URL allanol"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Creu categori"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Adroddwyd gan %s am %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "diweddarwyd ddiwethaf %s"
diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
index fc7b7763f..c7b34fc77 100644
--- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/da_DK.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " og "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s bydel, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, indefor bydel %s"
 
@@ -154,7 +154,7 @@ msgstr "(løst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(ikke rapporteret til myndigheden)"
 
@@ -162,17 +162,17 @@ msgstr "(ikke rapporteret til myndigheden)"
 msgid "(optional)"
 msgstr "(valgfrit)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Vælg en kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Vælg en ejendomsstype --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Ja</strong>, jeg har en adgangskode"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Tilføj bruger"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "Tilføjede %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Gentag:"
@@ -310,6 +332,12 @@ msgstr "Varsel %d koblet fra (oprettet %s)"
 msgid "Alert me to future updates"
 msgstr "Send mig varsel ved fremtidige opdateringer"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Alle rapporter"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Er du en udvikler?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr "Tildel til ekstern myndighed:"
 msgid "Assign to subdivision:"
 msgstr "Tildelt underafdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Afventer moderation"
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "Bandlys epostadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "Administrationer"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -588,10 +629,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -622,10 +667,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -633,11 +680,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Lukket"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Lukket af myndigheden"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -663,6 +710,11 @@ msgstr "Mærkevaresamarbejdsdata:"
 msgid "Cobrand:"
 msgstr "Mærkevaresamarbejde:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "brugte kort"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -726,8 +778,8 @@ msgstr "Kontakt projektgruppen"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kunne ikke finde bruger"
 
@@ -745,6 +797,36 @@ msgstr "Administration"
 msgid "Council contacts for %s"
 msgstr "Administrationskontakter for %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "markeret som lukket"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "markeret som fikset"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "markeret som under udførelse"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "markeret som undersøges"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "markeret som planlagt"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "myndighedsreference:&nbsp;%s"
@@ -769,15 +851,15 @@ msgstr "Lav en rapport"
 msgid "Create category"
 msgstr "Lav kategori"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -821,7 +903,11 @@ msgstr "Oversigt"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Behandlet af underafdeling inden 5 arbejdsdage"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -835,6 +921,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Slettet"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -871,6 +962,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Arbejdsheste"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Gem ændringer"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -896,23 +993,25 @@ msgstr "Kan du ikke lide skemaer?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplikat"
@@ -928,8 +1027,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -943,28 +1042,28 @@ msgid "Edit"
 msgstr "Redigér"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Redigér detaljer for myndighed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1003,7 +1102,7 @@ msgstr "Opdateret af"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Epost lagt til misbrugsliste"
 
@@ -1021,7 +1120,7 @@ msgstr "Epostvarsel laget"
 msgid "Email alert deleted"
 msgstr "Epostvarsel slettet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Epost allerede i misbrugslisten"
 
@@ -1072,7 +1171,7 @@ msgstr "Endepunkt"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Indtast et vejnavn i Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted"
 
@@ -1106,8 +1205,8 @@ msgstr "Indtast detaljer om problemet"
 msgid "Error"
 msgstr "Fejl"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1121,14 +1220,22 @@ msgid "Examples:"
 msgstr "Eksempler:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1137,6 +1244,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1157,8 +1265,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1183,10 +1291,12 @@ msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit bo
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1194,6 +1304,8 @@ msgstr "Løst"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Løst - Administration"
 
@@ -1202,7 +1314,7 @@ msgstr "Løst - Administration"
 msgid "Fixed - User"
 msgstr "Løst - Bruger"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1211,7 +1323,7 @@ msgid "Fixed:"
 msgstr "Løst:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Markér som slettet"
@@ -1297,11 +1409,13 @@ msgstr "Giv mig en RSS-strøm"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Glad for at høre at det er i orden!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Søg"
@@ -1310,11 +1424,11 @@ msgstr "Søg"
 msgid "Going to send questionnaire?"
 msgstr "Skal der sendes spørgeskema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graf over problemoprettelse fordelt på status over tid"
 
@@ -1330,7 +1444,7 @@ msgstr "Er dette problem blevet løst?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Har du rapporteret et problem til en myndighed før, eller er dette første gang?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1355,6 +1469,9 @@ msgstr "Hej, %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1362,6 +1479,11 @@ msgstr "Hej, %s"
 msgid "Hidden"
 msgstr "Skjul"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Send rapport igen"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Skjul gamle"
@@ -1370,6 +1492,10 @@ msgstr "Skjul gamle"
 msgid "Hide pins"
 msgstr "Skjul nåle"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historie"
@@ -1401,7 +1527,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1419,6 +1545,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr "Identificér en <strong>parent</strong> hvis instansen selv er en del af en anden myndighed."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1429,7 +1559,7 @@ msgstr "Hvis to eller flere instanser er lokaliseret på samme sted,  kombinerer
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Hvis du får mere information om status for dit problem, så vær sød at komme tilbage til netstedet og lav en opdatering."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1494,8 +1624,8 @@ msgstr "Ugyldigt ID"
 msgid "Illegal feed selection"
 msgstr "Ugyldigt valg af feed"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1513,7 +1643,9 @@ msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-s
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1531,7 +1663,7 @@ msgstr "Inkludér rapportørens personlige detaljer"
 msgid "Include unconfirmed reports"
 msgstr "Inkludér ubekræftede problemer"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Forkert has_photo-værdi \"%s\""
 
@@ -1539,7 +1671,7 @@ msgstr "Forkert has_photo-værdi \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1549,33 +1681,41 @@ msgstr "Interne notater"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Intern reference"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-værdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ugyldig slut-dato"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Ugyldigt format %s angivet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1606,6 +1746,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Husk min indlogning på denne datamaskine"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Sidste opdatering:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1619,11 +1768,12 @@ msgstr "Sidste opdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Sidste&nbsp;opdatering:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1631,6 +1781,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Lad denne være blank hvis alle rapporter til denne myndighed skal sendes ved hjælp af samme sende-metode (dvs. \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "List alle rapporterede problemer"
@@ -1652,7 +1806,8 @@ msgstr "Lokale RSS-strømme og e-postvarsler"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokale RSS-strømme og e-postvarsler"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokale varsler"
 
@@ -1660,15 +1815,36 @@ msgstr "Lokale varsler"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokalisér problemet på kortet over området"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "KORT"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1692,7 +1868,7 @@ msgstr "Markeret som løst/lukket indenfor de seneste otte uger"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Markeret som løst/lukket for mere end otte uger siden"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1712,7 +1888,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
@@ -1720,7 +1896,7 @@ msgstr "Mangler jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1728,15 +1904,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Publiceret af %s %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Publiceret af %s %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Modereret af afdeling inden for en arbejdsdag"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "andre områder:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1744,7 +1937,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1772,7 +1965,7 @@ msgstr "Navn:"
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1781,7 +1974,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1790,7 +1983,7 @@ msgstr "Nærmeste postnummer for nålen placeret på kortet (automatisk generere
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1874,7 +2067,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1882,6 +2075,7 @@ msgstr ""
 msgid "Next"
 msgstr "Næste"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1910,7 +2104,7 @@ msgstr "Ingen myndighed"
 msgid "No council"
 msgstr "Ingen myndighed"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ingen myndighed er valgt"
 
@@ -1928,6 +2122,8 @@ msgstr "Fant ingen markerede brugere."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1938,6 +2134,14 @@ msgstr "Kan ikke fikses"
 msgid "No further updates"
 msgstr "Ikke flere opdateringer"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Ingen resultater returneret"
@@ -1985,6 +2189,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2046,6 +2252,14 @@ msgstr "På tide at registrere din opdatering&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Gamle / ukendte <br>problemer"
@@ -2062,7 +2276,7 @@ msgstr "Ældre <br>løste"
 msgid "Older <br>problems"
 msgstr "Ældre <br>problemer"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2072,7 +2286,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2116,15 +2333,15 @@ msgstr "Eller problemer meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnere på varsel baseret på bydel eller myndighed du hører ind under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Andet"
 
@@ -2159,11 +2376,11 @@ msgstr "Adgangskode (valgfrit)"
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2230,8 +2447,8 @@ msgstr "Placér tegnestiften på kortet"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2257,14 +2474,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vælg en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Vælg en type egenskab"
 
@@ -2290,8 +2507,8 @@ msgstr "Vær ikke ufin &mdash; at skælde ud på din myndighed skader værdien a
 msgid "Please enter a message"
 msgstr "Venligst indlæg en besked"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2306,13 +2523,13 @@ msgid "Please enter a password"
 msgstr "Indtast en adgangskode"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Venligst angiv et emne"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2325,7 +2542,7 @@ msgstr "Tilføj en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Angiv din e-post"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Angiv oplysninger om problemet"
@@ -2352,14 +2569,14 @@ msgstr "Venligst angiv din e-postadresse"
 msgid "Please enter your first name"
 msgstr "Venligst angiv dit fornavn"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2424,7 +2641,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Venligst bemærk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2457,10 +2674,10 @@ msgstr "Venligst vælg hvilken type varsel du ønsker"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Venligs angiv om dette problem er blevet fikset eller ikke"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2483,15 +2700,15 @@ msgstr "Indsend"
 msgid "Posted anonymously at %s"
 msgstr "Publiceret anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Sendt ind af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Sendt ind af <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Sendt ind af <strong>%s</strong> %s"
 
@@ -2507,12 +2724,12 @@ msgstr "Forrige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Personliv"
 
@@ -2555,7 +2772,7 @@ msgstr "Problem %s sendt til myndighed %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling af problemer"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem markeret som åbent."
 
@@ -2563,7 +2780,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemer"
@@ -2584,13 +2801,13 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemer indenfor %.1fkm fra denne positionen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemer indenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemer indenfor %s bydel"
 
@@ -2636,7 +2853,7 @@ msgstr "Offentlig respons:"
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2672,11 +2889,11 @@ msgstr "Spørgeskema udfyldt af fejlrapportøren"
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS-strøm for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-strøm for %s bydel, %s"
 
@@ -2684,11 +2901,11 @@ msgstr "RSS-strøm for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS-strøm fra %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-strøm af %s, indenfor %s bydel"
 
@@ -2696,13 +2913,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS-strøm for problemer indenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-strøm for problemer indenfor %s bydel"
 
@@ -2721,7 +2938,7 @@ msgstr "RSS-strøm med opdateringer for dette problem"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2739,7 +2956,7 @@ msgstr "Nyligt løste <br>problemer"
 msgid "Recently reported problems"
 msgstr "Nyligt meldte problemer"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2778,12 +2995,12 @@ msgid "Report"
 msgstr "Rapport"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Rapportér et problem"
@@ -2801,6 +3018,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Rapport på %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Rapportér misbrug"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2812,7 +3034,7 @@ msgstr "Rapportér dit problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportér, find eller diskutér lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapporteret anonymt %s"
@@ -2822,7 +3044,7 @@ msgstr "Rapporteret anonymt %s"
 msgid "Reported before"
 msgstr "Rapporteret tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publiceret af %s %s"
@@ -2836,27 +3058,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Rapporteret i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapporteret i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporteret i kategorien %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Publiceret af %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporteret af %s af %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporteret af %s i kategorien %s af %s %s"
 
@@ -2880,11 +3102,12 @@ msgstr "Rapporterer et problem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes."
 
@@ -2892,10 +3115,6 @@ msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes."
 msgid "Reports awaiting approval"
 msgstr "Rapporter som venter på godkendelse"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2904,7 +3123,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Publicerede rapporter"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Rapportér et problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2916,10 +3140,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Send rapport igen"
@@ -2951,6 +3171,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2966,15 +3198,15 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotér til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2986,36 +3218,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satelit"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "markeret som duplikeret rapport"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Søg i rapporter"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søg i brugere"
 
@@ -3042,7 +3282,7 @@ msgstr "Søgningen fandt ingen brugere."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3076,7 +3316,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s senere"
 
@@ -3089,7 +3329,7 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Tjeneste:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3097,6 +3337,7 @@ msgstr ""
 msgid "Share"
 msgstr "Del"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3106,6 +3347,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3113,23 +3355,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Vis gamle"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Vis mit navn offentligt"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Vis mit navn offentligt"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Vis gamle"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Vis gamle"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Vis nåle"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3172,7 +3434,7 @@ msgstr "Nogen billeder af nylig meldte problemer"
 msgid "Some text to localize"
 msgstr "Noget tekst at oversætte"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3203,15 +3465,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3229,12 +3497,12 @@ msgstr "Start-dato:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
@@ -3250,7 +3518,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3271,7 +3539,7 @@ msgstr "Fortsat åben via spørgeskema, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Underkategori: %s"
 
@@ -3299,7 +3567,7 @@ msgstr "Send ind"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3356,11 +3624,11 @@ msgstr "Opsummering"
 msgid "Summary reports"
 msgstr "Opsummeringsrapporter"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3423,7 +3691,7 @@ msgstr "Tak for at du har lagt dit billede op.  Vi skal nu placere dit problem,
 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 "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?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv igen."
 
@@ -3437,7 +3705,7 @@ msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen.
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummer blev ikke genkendt, beklager."
 
@@ -3609,7 +3877,7 @@ msgstr "Der var problemer med at vise 'Alle rapporter'-siden.  Venligst prøv ig
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3692,18 +3960,18 @@ msgstr ""
 "Denne instans får kun rapporter for problemer som er lokaliseret i <strong>area covered</strong>.\n"
 "En instans vil ikke få nogen beskeder hvis det ikke dækker mindst ét område."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Denne e-post er blevet sendt til begge myndigheder som dækker stedet for problemet, da brugeren ikke kategoriserede det. Vær sød at ignorere den hvis I ikke er korrekt myndighed for at håndtere denne sag, eller give os besked om hvilken kategori af problemer dette er, så vi kan tilføje det i vores system."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Denne information er påkrævet"
 
@@ -3719,14 +3987,19 @@ msgstr "Dette er en oplistning af alle problemerne i denne tjeneste."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dette problem er løst"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dette problem er ikke blevet løst"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dette problem er ikke blevet løst"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3774,7 +4047,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3805,8 +4078,26 @@ msgstr "For at se et kort med en mere præsis placering for dette problem."
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "markeret som fikset"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3814,7 +4105,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3839,7 +4130,8 @@ msgstr "Forsøg at sende epost direkte til os:"
 msgid "Unconfirmed"
 msgstr "Ubekræftet"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3863,6 +4155,10 @@ msgstr "Ukendt fejl"
 msgid "Unknown problem ID"
 msgstr "Ukendt problem-Id"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3919,10 +4215,10 @@ msgstr "Opdatér tilstanden"
 msgid "Updated"
 msgstr "Opdateret"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3966,26 +4262,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Brugermarkering fjernet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Bruger markeret"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "markeret som fikset"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Brugersøgning finder træf på brugernavne og epostadresser. "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brugere"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4016,6 +4318,15 @@ msgstr "Ser på et sted"
 msgid "Viewing a problem"
 msgstr "Ser på et problem"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Bydele indenfor denne myndighed"
@@ -4035,7 +4346,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Vi indser at %s kan være ansvarlig for dette problem, men vi mangler for tiden kontaktinformation for dem. Hvis du kender en egnet kontaktadresse, så tag kontakt med os."
 
@@ -4052,6 +4363,10 @@ msgstr "Vi vil kun bruge personlig information om dig i henhold til vore <a href
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Vi er kede af at høre at problemet ikke er løst. Hvad med at forsøge at skrive til dine lokale repræsentanter?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Vi tager kontakt med dig så snart vi kan."
@@ -4069,11 +4384,11 @@ msgstr "Hvornår redigeret"
 msgid "When sent"
 msgstr "Hvornår sendt"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4108,10 +4423,16 @@ msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig
 msgid "Wrong location? Just click again on the map."
 msgstr "Forkert sted? Bare klik igen på kortet."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "År"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4140,6 +4461,10 @@ msgstr "Ja, jeg har en adgangskode"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du klager over at denne problemrapport blev modereret uden grund:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:"
@@ -4185,6 +4510,10 @@ msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal
 msgid "You declined; please fill in the box above"
 msgstr "Du afviste; venligst udfyld boksen ovenfor"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4245,7 +4574,7 @@ msgid "Your Reports"
 msgstr "Dine rapporter"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4282,6 +4611,11 @@ msgstr "Vi vil kun bruge personlig information om dig i henhold til vores <a hre
 msgid "Your name"
 msgstr "Dit navn"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Dine opdateringer"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4311,6 +4645,10 @@ msgstr "Dine opdateringer"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Dine opdateringer"
@@ -4321,7 +4659,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4329,7 +4667,7 @@ msgstr ""
 msgid "by %s"
 msgstr "af %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "markeret som duplikeret rapport"
 
@@ -4357,49 +4695,49 @@ msgstr "redigér bruger"
 msgid "from %s different users"
 msgstr "fra %s forskellige brugere"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "sidst opdateret %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "mindre end et minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "markeret som planlagt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "markeret som en intern henvisning"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "markeret som lukket"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "markeret som fikset"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "markeret som under udførelse"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "markeret som undersøges"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "markeret som uløseligt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "markeret som ikke myndighedens ansvar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "markeret som planlagt"
 
@@ -4410,7 +4748,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4445,8 +4783,8 @@ msgstr "oprinnelig lagt ind: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andre områder:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "åbnet igen"
 
@@ -4467,7 +4805,7 @@ msgstr "den lokale myndighed"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "Der vises ingen nål på grund af at brugeren ikke brugte kortet"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "denne type lokalt problem"
 
@@ -4475,6 +4813,16 @@ msgstr "denne type lokalt problem"
 msgid "today"
 msgstr "idag"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Opdatering"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Opdateringer"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "brugte kort"
@@ -4492,27 +4840,41 @@ msgstr "bruger er ejer af problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dage"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minutter"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minut"
+msgstr[1] "%d minutter"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4520,13 +4882,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d supporter"
 msgstr[1] "%d supportere"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uge"
 msgstr[1] "%d uger"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4555,6 +4924,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> rapport-<br>opdatering"
 msgstr[1] "<big>%s</big> rapport-<br>opdateringer"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Publiceret af %s %s"
+msgstr[1] "Publiceret af %s %s"
+
 #: 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."
@@ -4568,3 +4944,37 @@ 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted."
 msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "sidst opdateret %s"
+msgstr[1] "sidst opdateret %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Rapport"
+msgstr[1] "Rapport"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle rapporter"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Eksternt link"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Lav kategori"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Publiceret af %s %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "sidst opdateret %s"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index f04acee65..ae48659fc 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "und"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr "(beantwortet)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr ""
 
@@ -162,17 +162,17 @@ msgstr ""
 msgid "(optional)"
 msgstr "(optional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Wählen Sie eine Kategorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr ""
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Zeige</label> %s <label for=\"filter_categories\">&uuml;ber</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "Neu Registrieren"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "Passwort"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "User hinzuf&uuml;gen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr ""
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Nochmals"
@@ -310,6 +332,12 @@ msgstr ""
 msgid "Alert me to future updates"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Alle Meldungen"
 msgid "All Reports as CSV"
 msgstr "Als CSV exportieren"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr "Nachricht an zuständige Stelle"
 msgid "Assign to subdivision:"
 msgstr "An Fachbereich zuweisen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Überprüfung ausstehend"
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "Externe Adressen"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorie"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategorie: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr "Klicken Sie auf den Link im Best&auml;tigungsemail um sich anzumelden."
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr "Klicken Sie auf den Link im Best&auml;tigungsemail um sich anzumelden."
 msgid "Closed"
 msgstr "Beantwortet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "Abgeschlossene Meldungen"
 
@@ -654,6 +701,11 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Karte verwendet"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr "Koordinaten"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr ""
 
@@ -736,6 +788,32 @@ msgstr ""
 msgid "Council contacts for %s"
 msgstr "Kontaktdetails von %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+msgid "Council has marked as closed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "als beantwortet markiert"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +838,15 @@ msgstr "Erfasse eine Meldung"
 msgid "Create category"
 msgstr "Kategorie erstellen"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +890,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Innerhalb von f&uuml;nf Arbeitstagen abgeschlossen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +908,11 @@ msgstr "Vorlage löschen"
 msgid "Deleted"
 msgstr "Gel&ouml;scht"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +949,12 @@ msgstr "hat Karte nicht verwendet"
 msgid "Diligency prize league table"
 msgstr "Weiss ich nicht"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Speichern"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +980,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Fotos hierhin ziehen oder <u>hochladen</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplikat"
@@ -916,8 +1011,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1026,28 @@ msgid "Edit"
 msgstr "Anpassen"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Details editieren"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1086,7 @@ msgstr ""
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -1009,7 +1104,7 @@ msgstr "E-Mail Benachrichtigung erstellt"
 msgid "Email alert deleted"
 msgstr "E-Mail Benachrichtigung gel&ouml;scht"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr ""
 
@@ -1054,7 +1149,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Ungef&auml;hre Adresse des Schadens"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Geben Sie eine Adresse an"
 
@@ -1088,8 +1183,8 @@ msgstr "Beschreiben Sie den Schaden"
 msgid "Error"
 msgstr "Fehler"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Alles"
 
@@ -1103,14 +1198,23 @@ msgid "Examples:"
 msgstr "Beispiele:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Als CSV exportieren"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1223,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1244,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1270,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1283,8 @@ msgstr "Beantwortet"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -1184,7 +1293,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "Beantwortete Meldungen"
 
@@ -1193,7 +1302,7 @@ msgid "Fixed:"
 msgstr ""
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Als gel&#246;scht markieren"
@@ -1279,11 +1388,13 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Los"
@@ -1292,11 +1403,11 @@ msgstr "Los"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Grafik der Meldungen nach Status und Zeit"
 
@@ -1312,7 +1423,7 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1448,9 @@ msgstr "Hallo %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1458,11 @@ msgstr "Hallo %s"
 msgid "Hidden"
 msgstr "Unsichtbar"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Erfasse eine Meldung"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Alte ausblenden"
@@ -1352,6 +1471,10 @@ msgstr "Alte ausblenden"
 msgid "Hide pins"
 msgstr "Stecknadeln ausblenden"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "History"
@@ -1383,7 +1506,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1524,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1538,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1596,8 @@ msgstr "Unbekannt ID"
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1615,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1635,7 @@ msgstr "Pers&ouml;nliche Angaben des Meldenden mitsenden"
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1643,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1653,41 @@ msgstr "Interne Notizen"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ung&ultiges Enddatum"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ung&ultiges Startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1718,15 @@ msgstr "Zust&auml;ndigkeit unbekannt"
 msgid "Keep me signed in on this computer"
 msgstr "Angemeldet bleiben"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Letzte Bearbeitung"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1740,12 @@ msgstr "Letzte Bearbeitung"
 msgid "Last&nbsp;update:"
 msgstr "Letzte Bearbeitung"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1753,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Liste aller Meldungen"
@@ -1627,7 +1778,8 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "RSS"
 
@@ -1635,15 +1787,36 @@ msgstr "RSS"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokalisieren Sie den Schaden auf der Karte"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1840,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1860,7 @@ msgstr "Nachricht an zuständige Stelle"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1695,7 +1868,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1876,31 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Gemeldet von %s um %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Gemeldet von %s um %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Innerhalb eines Arbeitstages moderiert"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1908,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1936,7 @@ msgstr "Name:"
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1945,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1954,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2036,7 @@ msgstr "Neuer Status"
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2044,7 @@ msgstr ""
 msgid "Next"
 msgstr "Weiter"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2073,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr ""
 
@@ -1901,6 +2091,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2103,14 @@ msgstr ""
 msgid "No further updates"
 msgstr "Bearbeitung abschliessen"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1951,6 +2151,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2214,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -2028,7 +2238,7 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2248,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2295,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr ""
 
@@ -2125,11 +2338,11 @@ msgstr "Passwort"
 msgid "Password:"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2409,8 @@ msgstr "Pin auf der Karte absetzen"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2436,14 @@ msgid "Please check your email address is correct"
 msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre E-Mail Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Bitte w&auml;hlen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2256,8 +2469,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2485,13 @@ msgid "Please enter a password"
 msgstr "Obligatorisches Feld"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2504,7 @@ msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Bitte geben Sie einige Details an"
@@ -2318,14 +2531,14 @@ msgstr "Ihre E-Mail Adresse"
 msgid "Please enter your first name"
 msgstr "Bitte geben Sie Ihren Namen an"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2601,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2634,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2660,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2471,12 +2684,12 @@ msgstr "Zur&uuml;ck"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2519,7 +2732,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr "Meldungen nach Status sortiert"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2527,7 +2740,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Meldungen"
@@ -2548,13 +2761,13 @@ msgstr "Meldungen, welche k&uuml;rzlich beantwortet wurden"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Meldungen innerhalb %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2600,7 +2813,7 @@ msgstr "R&uuml;ckmeldung an User"
 msgid "Public response:"
 msgstr "R&uuml;ckmeldung an User"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2636,11 +2849,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -2648,11 +2861,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2660,13 +2873,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2685,7 +2898,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2703,7 +2916,7 @@ msgstr "K&uuml;rzlich <br>beantwortet"
 msgid "Recently reported problems"
 msgstr "K&uuml;rzlich erfasste Meldungen:"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2742,12 +2955,12 @@ msgid "Report"
 msgstr "Meldung"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Eine Meldung erfassen"
@@ -2765,6 +2978,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Gemeldet"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2776,7 +2994,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Melden Sie Sch&auml;den an der Infrastruktur von Z&uuml;rich"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
@@ -2786,7 +3004,7 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
@@ -2800,27 +3018,27 @@ msgstr "Gemeldet von"
 msgid "Reported in the %s category"
 msgstr "In der Kategorie %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "In der Kategorie %s um %s gemeldet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2844,11 +3062,12 @@ msgstr "Ihre Meldung"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Meldungen"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2856,10 +3075,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr "R&uuml;ckmeldung ausstehend"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2868,7 +3083,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Beantwortet"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Eine Meldung erfassen"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2880,10 +3100,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2915,6 +3131,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr "Vorlagen für %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2930,15 +3158,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2950,35 +3178,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Speichern"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Meldungen suchen"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "User suchen"
 
@@ -3005,7 +3241,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3039,7 +3275,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "Meldung zur&uuml;ckgewiesen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3052,7 +3288,7 @@ msgstr "Gesendet:"
 msgid "Service:"
 msgstr "Gerät"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3060,6 +3296,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3069,6 +3306,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3076,23 +3314,42 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Zeige Stecknadeln"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Zeige Stecknadeln"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Zeige Stecknadeln"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3132,7 +3389,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3163,15 +3420,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Diese Adresse wurde nicht gefunden."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3189,12 +3452,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
@@ -3210,7 +3473,7 @@ msgstr "Status"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3231,7 +3494,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3259,7 +3522,7 @@ msgstr "Abschicken"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3316,11 +3579,11 @@ msgstr "Zusammenfassung"
 msgid "Summary reports"
 msgstr "Alle Meldungen"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3383,7 +3646,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3397,7 +3660,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3553,7 +3816,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3627,18 +3890,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Diese Information wird ben&ouml;tigt"
 
@@ -3654,14 +3917,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dieser Schaden wurde behoben"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dieser Schaden wurde nicht behoben"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dieser Schaden wurde nicht behoben"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3709,7 +3977,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3740,8 +4008,26 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "als beantwortet markiert"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3749,7 +4035,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3774,7 +4060,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Unbest&auml;tigt"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "Offene Meldungen"
 
@@ -3798,6 +4085,10 @@ msgstr "Unbekannter Fehler"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3854,10 +4145,10 @@ msgstr ""
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3901,26 +4192,32 @@ msgstr "Karte verwendet"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "als beantwortet markiert"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3951,6 +4248,15 @@ msgstr "Meldung erfassen"
 msgid "Viewing a problem"
 msgstr "Meldung anschauen"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3970,7 +4276,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3987,6 +4293,10 @@ msgstr "Ihre pers&ouml;nlichen Angaben werden nur f&uuml;r interne Zwecke verwen
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4004,11 +4314,11 @@ msgstr "Wann editiert"
 msgid "When sent"
 msgstr "Wann gesendet"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4043,10 +4353,16 @@ msgstr "Meldungen g&auml;nzlich in Grossbuchstaben zu schreiben macht diese unle
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Jahr"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4075,6 +4391,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4118,6 +4438,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4176,7 +4500,7 @@ msgid "Your Reports"
 msgstr "Ihre Meldungen"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4213,6 +4537,11 @@ msgstr "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a h
 msgid "Your name"
 msgstr "Ihr Name"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Ihre Meldungen"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4242,6 +4571,10 @@ msgstr "Ihre Meldungen"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -4252,7 +4585,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4260,7 +4593,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4288,49 +4621,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr "von %s verschiedenen Personen"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "letzte Bearbeitung %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "als beantwortet markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4341,7 +4674,7 @@ msgid "n/a"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4376,8 +4709,8 @@ msgstr "Originaltext: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -4398,7 +4731,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht ben&uuml;tzt hat"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4406,6 +4739,16 @@ msgstr ""
 msgid "today"
 msgstr "heute"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Speichern"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Antwort"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "Karte verwendet"
@@ -4423,27 +4766,41 @@ msgstr "Der User ist der Eigner der Meldung"
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4451,13 +4808,20 @@ msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4486,6 +4850,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> Meldung bearbeitet"
 msgstr[1] "<big>%s</big> Meldungen bearbeitet"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Gemeldet von %s um %s"
+msgstr[1] "Gemeldet von %s um %s"
+
 #: 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."
@@ -4499,3 +4870,33 @@ 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.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "letzte Bearbeitung %s"
+msgstr[1] "letzte Bearbeitung %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Meldung"
+msgstr[1] "Meldung"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle Meldungen"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Kategorie erstellen"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Gemeldet von %s um %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "letzte Bearbeitung %s"
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 82e9342bc..1783fe6f0 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2016\n"
 "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "und"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s Stadtteil, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr "(gel&ouml;st)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr ""
 
@@ -162,17 +162,17 @@ msgstr ""
 msgid "(optional)"
 msgstr "(optional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(gesendet an beide)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- W&auml;hlen Sie eine Kategorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Wählen Sie eine Eigentumsart --"
 
@@ -184,6 +184,14 @@ msgstr "--Wählen Sie eine Vorlage aus--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Ja</strong>, ich habe ein Passwort"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Benutzer hinzufügen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "%s hinzugefügt"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Nochmals:"
@@ -310,6 +332,12 @@ msgstr "Alarm %d deaktiviert (erstellt %s)"
 msgid "Alert me to future updates"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Alle Meldungen"
 msgid "All Reports as CSV"
 msgstr "Alle Berichte als CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Sind Sie ein Entwickler?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Wartet auf Moderation"
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorie"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategorie: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Geschlossen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,10 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +768,8 @@ msgstr "Kontaktieren Sie das Team"
 msgid "Coordinates:"
 msgstr "Koordinaten:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Benutzer konnte nicht gefunden werden"
 
@@ -736,6 +787,36 @@ msgstr "Rat"
 msgid "Council contacts for %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "als geschlossen markiert"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "als gel&ouml;st markiert"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "als in Bearbeitung markiert"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "als untersuchend markiert"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "als geplant markiert"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +841,15 @@ msgstr "Erfasse eine Meldung"
 msgid "Create category"
 msgstr "Kategorie erstellen"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +893,11 @@ msgstr "Übersichtsseite"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +911,11 @@ msgstr "Vorlage löschen"
 msgid "Deleted"
 msgstr "Gel&ouml;scht"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +952,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Weiss ich nicht"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "&Auml;nderungen speichern"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +983,25 @@ msgstr "Sie mögen keine Formulare?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplizieren"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplizieren"
@@ -916,8 +1014,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1029,28 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1089,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "E-Mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -1009,7 +1107,7 @@ msgstr "E-Mail-Benachrichtigung erstellt"
 msgid "Email alert deleted"
 msgstr "E-Mail-Benachrichtigung gelöscht"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr ""
 
@@ -1054,7 +1152,7 @@ msgstr "Endpunkt"
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1088,8 +1186,8 @@ msgstr "Beschreiben sie den Mangel"
 msgid "Error"
 msgstr "Fehler"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Alles"
 
@@ -1103,14 +1201,23 @@ msgid "Examples:"
 msgstr "Beispiele:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Alle Berichte als CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1226,7 @@ msgid "Extern"
 msgstr "Extern"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1247,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Zusätzliche Daten:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1273,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1286,8 @@ msgstr "Gel&ouml;st"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -1184,7 +1296,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1193,7 +1305,7 @@ msgid "Fixed:"
 msgstr ""
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1279,11 +1391,13 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Los"
@@ -1292,11 +1406,11 @@ msgstr "Los"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1312,7 +1426,7 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1451,9 @@ msgstr "Hallo %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1461,11 @@ msgstr "Hallo %s"
 msgid "Hidden"
 msgstr "Unsichtbar"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Bericht erneut senden"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Alte ausblenden"
@@ -1352,6 +1474,10 @@ msgstr "Alte ausblenden"
 msgid "Hide pins"
 msgstr "Stecknadeln ausblenden"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "History"
@@ -1383,7 +1509,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1527,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1541,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1599,8 @@ msgstr "Unbekannt ID"
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1618,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1638,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Unbestätigte Berichte miteinbeziehen"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1646,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1656,41 @@ msgstr "Interne Hinweise"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ung&ultiges Enddatum"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Ungültiges Format %s angegeben."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ung&ultiges Startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1721,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Letzte Bearbeitung"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1743,12 @@ msgstr "Letzte Bearbeitung"
 msgid "Last&nbsp;update:"
 msgstr "Letzte&nbsp;Aktualisierung:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1756,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Liste aller Meldungen"
@@ -1627,7 +1781,8 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "RSS"
 
@@ -1635,15 +1790,36 @@ msgstr "RSS"
 msgid "Locate the problem on a map of the area"
 msgstr "Identifizieren Sie den Mangel auf der Karte"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "KARTE"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1843,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1863,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Fehlendes jurisdiction_id"
 
@@ -1695,7 +1871,7 @@ msgstr "Fehlendes jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1879,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Gemeldet von %s um %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Gemeldet von %s um %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "andere Gebiete:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Monat"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1912,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1940,7 @@ msgstr "Name:"
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1949,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1958,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2040,7 @@ msgstr "Neuer Status"
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2048,7 @@ msgstr ""
 msgid "Next"
 msgstr "Weiter"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2077,7 @@ msgstr ""
 msgid "No council"
 msgstr "Kein Rat"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Kein Rat ausgewählt"
 
@@ -1901,6 +2095,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2107,14 @@ msgstr "Kann nicht behoben werden"
 msgid "No further updates"
 msgstr "Keine weiteren Aktualisierungen"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Kein Ergebnis zurückgegeben"
@@ -1951,6 +2155,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2218,14 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Alte / unbekannte <br>Probleme"
@@ -2028,7 +2242,7 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr "Ältere <br>Probleme"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2252,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2299,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Andere"
 
@@ -2125,11 +2342,11 @@ msgstr "Passwort (optional)"
 msgid "Password:"
 msgstr "Passwort:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2413,8 @@ msgstr "Stecknadel auf Karte platzieren"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2440,14 @@ msgid "Please check your email address is correct"
 msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre eMail-Adresse korrekt ist"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Bitte w&auml;hlen Sie eine Kategorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Bitte wählen Sie eine Eigentumsart"
 
@@ -2256,8 +2473,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Bitte geben Sie eine Nachricht ein"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Bitte geben Sie Ihren Namen ein"
 
@@ -2272,13 +2489,13 @@ msgid "Please enter a password"
 msgstr "Bitte geben Sie ein Passwort ein"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Bitte geben Sie einen Betreff ein"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2508,7 @@ msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
 msgid "Please enter a valid email address"
 msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Bitte geben Sie einiges Details an"
@@ -2318,14 +2535,14 @@ msgstr "Bitte geben Sie eine Ihre eMail-Adresse an"
 msgid "Please enter your first name"
 msgstr "Bitte geben Sie Ihren Vornamen ein"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2605,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Hinweise:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2638,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2664,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2471,12 +2688,12 @@ msgstr "Vorherige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Datenschutz"
 
@@ -2519,7 +2736,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem als offen markiert."
 
@@ -2527,7 +2744,7 @@ msgstr "Problem als offen markiert."
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Meldungen"
@@ -2548,13 +2765,13 @@ msgstr "Meldungen, welche k&uuml;rzlich gel&ouml;st wurden"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Meldungen innerhalb %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2599,7 +2816,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2635,11 +2852,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS-Feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -2647,11 +2864,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2659,13 +2876,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2684,7 +2901,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr "Erhalten Sie Aktualisierungen dieser Meldung."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2702,7 +2919,7 @@ msgstr "Kürzlich <br>repariert"
 msgid "Recently reported problems"
 msgstr "K&uuml;rzlich erfasste Meldungen"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2741,12 +2958,12 @@ msgid "Report"
 msgstr "Bericht"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Eine Meldung erfassen"
@@ -2764,6 +2981,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Bericht auf %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Gemeldet:"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2775,7 +2997,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Melden sie M&auml;ngel an der Infrastruktur von Z&uuml;rich"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anonym gemeldet um"
@@ -2785,7 +3007,7 @@ msgstr "Anonym gemeldet um"
 msgid "Reported before"
 msgstr "Vorher berichtet"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeldet von %s um %s"
@@ -2799,27 +3021,27 @@ msgstr "Gemeldet von:"
 msgid "Reported in the %s category"
 msgstr "Gemeldet in der Kategorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Anonym gemeldet von %s um %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeldet von %s um %s"
 
@@ -2843,11 +3065,12 @@ msgstr "Verfassen Sie eine Meldung"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Berichte"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2855,10 +3078,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr "Berichte warten auf Moderation"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2867,7 +3086,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Berichte veröffentlicht"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Eine Meldung erfassen"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2879,10 +3103,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Bericht erneut senden"
@@ -2914,6 +3134,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2929,15 +3161,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Nach links drehen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2949,35 +3181,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satellit"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "&Auml;nderungen speichern"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Berichte suchen"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Benutzer suchen"
 
@@ -3004,7 +3244,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3038,7 +3278,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3051,7 +3291,7 @@ msgstr "Gesendet:"
 msgid "Service:"
 msgstr "Dienst:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3059,6 +3299,7 @@ msgstr ""
 msgid "Share"
 msgstr "Teilen"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3068,6 +3309,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3075,23 +3317,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Alte anzeigen"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Meinen Namen öffentlich anzeigen"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Meinen Namen öffentlich anzeigen"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Alte anzeigen"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Alte anzeigen"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Zeige Stecknadeln"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3131,7 +3393,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3162,15 +3424,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3188,12 +3456,12 @@ msgstr "Startdatum:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
@@ -3209,7 +3477,7 @@ msgstr "Status:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3230,7 +3498,7 @@ msgstr ""
 msgid "Street View"
 msgstr "Straßenansicht"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Unterkategorie: %s"
 
@@ -3258,7 +3526,7 @@ msgstr "Abschicken"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3315,11 +3583,11 @@ msgstr "Zusammenfassung"
 msgid "Summary reports"
 msgstr "Zusammenfassungsberichte"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3382,7 +3650,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3396,7 +3664,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3552,7 +3820,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3626,18 +3894,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Diese Information wird ben&ouml;tigt"
 
@@ -3653,14 +3921,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dieser Mangel wurde behoben"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dieser Mangel wurde nicht behoben"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dieser Mangel wurde nicht behoben"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3708,7 +3981,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3739,8 +4012,26 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "als gel&ouml;st markiert"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3748,7 +4039,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3773,7 +4064,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Unbest&auml;tigt"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3797,6 +4089,10 @@ msgstr "Unbekannter Fehler"
 msgid "Unknown problem ID"
 msgstr "Unbekannte Problemkennung"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3853,10 +4149,10 @@ msgstr ""
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3900,26 +4196,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "als gel&ouml;st markiert"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3950,6 +4252,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3969,7 +4280,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3986,6 +4297,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4003,11 +4318,11 @@ msgstr "Wann editiert"
 msgid "When sent"
 msgstr "Wann gesendet"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4042,10 +4357,16 @@ msgstr "Meldungen g&auml;nzlich in Grossbuchstaben zu schreiben macht diese unle
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Jahr"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4074,6 +4395,10 @@ msgstr "Ja, ich habe ein Passwort"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4117,6 +4442,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4175,7 +4504,7 @@ msgid "Your Reports"
 msgstr "Ihre Berichte"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4212,6 +4541,11 @@ msgstr ""
 msgid "Your name"
 msgstr "Ihr Name"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Ihre Meldungen"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4241,6 +4575,10 @@ msgstr "Ihre Meldungen"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Ihre Aktualisierungen"
@@ -4251,7 +4589,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4259,7 +4597,7 @@ msgstr ""
 msgid "by %s"
 msgstr "von %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4287,49 +4625,49 @@ msgstr "Benutzer bearbeiten"
 msgid "from %s different users"
 msgstr "von %s verschiedenen Benutzern"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "zuletzt aktualisiert %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "weniger als einer Minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "als Aktion geplant markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "als geschlossen markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "als gel&ouml;st markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "als in Bearbeitung markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "als untersuchend markiert"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "als geplant markiert"
 
@@ -4340,7 +4678,7 @@ msgid "n/a"
 msgstr "n/v"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4375,8 +4713,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "andere Gebiete:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "erneut geöffnet"
 
@@ -4397,7 +4735,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4405,6 +4743,16 @@ msgstr ""
 msgid "today"
 msgstr "heute"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Beschreibung"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Aktualisierungen"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4422,27 +4770,41 @@ msgstr "Benutzer ist Problemeigentümer"
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4450,13 +4812,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d Unterstützer"
 msgstr[1] "%d Unterstützer"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4485,6 +4854,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> Meldung bearbeitet"
 msgstr[1] "<big>%s</big> Meldungen bearbeitet"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Gemeldet von %s um %s"
+msgstr[1] "Gemeldet von %s um %s"
+
 #: 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."
@@ -4498,3 +4874,37 @@ 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.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "zuletzt aktualisiert %s"
+msgstr[1] "zuletzt aktualisiert %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Bericht"
+msgstr[1] "Bericht"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle Meldungen"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Externe URL"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Kategorie erstellen"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Gemeldet von %s um %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "zuletzt aktualisiert %s"
diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4e46a9b9e..be848af4b 100644
--- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/el_GR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "και"
 
@@ -116,11 +116,11 @@ msgstr ""
 "άρα θα εμφανίζεται και στις δύο κατηγορίες ειδοποιήσεων της υπηρεσίας, ενώ όσον αφορά την επικεφαλής υπηρεσία θα εμφανίζεται μόνο στην κατηγορία ειδοποιήσεων\n"
 "\"Εντός του τομέα ευθύνης\"."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s περιοχή, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, στην περιοχή %quot;%s&quot;"
 
@@ -168,7 +168,7 @@ msgstr "(διορθώθηκε)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένες πλάκες πεζοδρομίου ή καμένα φώτα δρόμων)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(δεν αποστάλθηκε σε υπηρεσία)"
 
@@ -176,17 +176,17 @@ msgstr "(δεν αποστάλθηκε σε υπηρεσία)"
 msgid "(optional)"
 msgstr "(προαιρετικό)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(στάλθηκε και στις δύο)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Διάλεξε κατηγορία --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Διάλεξε είδος ακινήτου --"
 
@@ -198,6 +198,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -209,12 +217,20 @@ msgstr ""
 "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).<br>\n"
 "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Προβολή</label> %s <label for=\"filter_categories\">σχετικά με</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -233,11 +249,11 @@ msgstr "<strong>Όχι</strong> Να γίνει επιβεβαίωση της ε
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Όχι</strong> να συνδεθώ μέσω email"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -249,6 +265,8 @@ msgstr "<strong>Ναι</strong> έχω κωδικό πρόσβασης"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -293,15 +311,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Προσθήκη χρήστη"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -313,6 +331,10 @@ msgstr "Προστέθηκε %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Ξανά:"
@@ -329,6 +351,12 @@ msgstr "Η ειδοποίηση %d απενεργοποιήθηκε (δημιο
 msgid "Alert me to future updates"
 msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσεις"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -338,12 +366,14 @@ msgstr "Όλες οι Αναφορές"
 msgid "All Reports as CSV"
 msgstr "Όλες οι Αναφορές ως CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -378,11 +408,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Είσαι προγραμματιστής;"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την μεταφόρτωση;"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -419,7 +450,7 @@ msgstr "Ανάθεση σε εξωτερικό τομέα:"
 msgid "Assign to subdivision:"
 msgstr "Ανάθεση στο τμήμα:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -445,15 +476,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Σε αναμονή ελέγχου"
@@ -471,7 +510,7 @@ msgid "Ban email address"
 msgstr "Αποκλεισμός της διεύθυνσης email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -480,7 +519,7 @@ msgid "Bodies"
 msgstr "Τομείς"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -508,14 +547,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -526,7 +566,7 @@ msgstr ""
 msgid "Category"
 msgstr "Κατηγορία"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -536,6 +576,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -543,7 +584,7 @@ msgstr "Μέσος όρος διόρθωσης προβλημάτων για τ
 msgid "Category:"
 msgstr "Κατηγορία:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Κατηγορία: %s"
 
@@ -607,10 +648,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -641,10 +686,12 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -652,11 +699,11 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα
 msgid "Closed"
 msgstr "Κλειστό"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Κλειστό από την υπηρεσία"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "κλειστές αναφορές"
 
@@ -682,6 +729,11 @@ msgstr "Δεδομένα προστεθέντος σήματος:"
 msgid "Cobrand:"
 msgstr "Προστεθέν σήμα:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Χάρτης σε χρήση"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -745,8 +797,8 @@ msgstr "Επικοινώνησε με την ομάδα διαχείρισης"
 msgid "Coordinates:"
 msgstr "Συντεταγμένες:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Δεν είναι δυνατή η εύρεση χρήστη"
 
@@ -764,6 +816,36 @@ msgstr "Υπηρεσία"
 msgid "Council contacts for %s"
 msgstr "Επαφές υπηρεσίας για &quot;%s&quot;"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "σημειωμένο ως κλειστό"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "σημειωμένο ως διορθωμένο"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "σημειωμένο ως σε διαδικασία αντιμετώπισης"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "σημειωμένο ως υπό έλεγχο"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "σημειωμένο ως προγραμματισμένο"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "υπηρεσία αναφ.:&nbsp;%s"
@@ -788,15 +870,15 @@ msgstr "Δημιουργία αναφοράς"
 msgid "Create category"
 msgstr "Δημιουργία κατηγορίας"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -840,7 +922,11 @@ msgstr "Πίνακας Ελέγχου"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσιμες ημέρες"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -854,6 +940,11 @@ msgstr "Διαγραφή προτύπου"
 msgid "Deleted"
 msgstr "Διαγραμμένα"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -890,6 +981,12 @@ msgstr "Δεν χρησιμοποιήθηκε ο χάρτης"
 msgid "Diligency prize league table"
 msgstr "Πίνακας βραβείων επιμέλειας"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Αποθήκευση αλλαγών"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -915,23 +1012,25 @@ msgstr "Δεν σου αρέσουν οι φόρμες;"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Σύρε φωτογραφίες εδώ ή <u>κάνε κλικ για ανέβασμα</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Διπλότυπο"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Διπλότυπο"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Διπλότυπο"
@@ -947,8 +1046,8 @@ msgstr ""
 "Διαφορετικές κατηγορίες <strong>μπορούν να ανήκουν στην ίδια επαφή</strong> (διεύθυνση email).\n"
 "Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα."
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -962,28 +1061,28 @@ msgid "Edit"
 msgstr "Επεξεργασία"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Επεξεργασία λεπτομερειών του τομέα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1022,7 +1121,7 @@ msgstr "Επεξεργαστής"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Το Email προστέθηκε στην μαύρη λίστα"
 
@@ -1040,7 +1139,7 @@ msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε"
 msgid "Email alert deleted"
 msgstr "Η ειδοποίηση μέσω email διεγράφη"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Το Email είναι ήδη στην μαύρη λίστα"
 
@@ -1092,7 +1191,7 @@ msgstr "Σημείο τερματισμού"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Δώσε μια ονομασία για την οδό"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή"
 
@@ -1126,8 +1225,8 @@ msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλ
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Τα πάντα"
 
@@ -1141,14 +1240,23 @@ msgid "Examples:"
 msgstr "Παραδείγματα:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Όλες οι Αναφορές ως CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1157,6 +1265,7 @@ msgid "Extern"
 msgstr "Εξωτερικός"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1177,8 +1286,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Επιπλέον δεδομένα:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1203,10 +1312,12 @@ msgstr "Διόρθωσέ το επιλέγοντας μία <strong>περιοχ
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1214,6 +1325,8 @@ msgstr "Διορθώθηκε"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Διορθώθηκε - Υπηρεσία"
 
@@ -1222,7 +1335,7 @@ msgstr "Διορθώθηκε - Υπηρεσία"
 msgid "Fixed - User"
 msgstr "Διορθώθηκε - Χρήστης"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "διορθωμένες αναφορές"
 
@@ -1231,7 +1344,7 @@ msgid "Fixed:"
 msgstr "Διορθώθηκε:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Σήμανση ως διαγραμμένο"
@@ -1317,11 +1430,13 @@ msgstr "Λήψη μίας ροής RSS "
 msgid "Glad to hear it’s been fixed!"
 msgstr "Χαιρόμαστε που φτιάχτηκε!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Εμπρός"
@@ -1330,11 +1445,11 @@ msgstr "Εμπρός"
 msgid "Going to send questionnaire?"
 msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Γράφημα της δημιουργίας προβλημάτων (κατάσταση προς χρόνος)"
 
@@ -1350,7 +1465,7 @@ msgstr "Διορθώθηκε το πρόβλημα;"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Έχεις αναφέρει ποτέ ξανά ένα πρόβλημα στην υπηρεσία ή αυτή είναι η πρώτη φορά;"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1375,6 +1490,9 @@ msgstr "Γεια %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1382,6 +1500,11 @@ msgstr "Γεια %s"
 msgid "Hidden"
 msgstr "Κρυμμένα"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Επαναποστολή αναφοράς"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Απόκρυψη παλιών"
@@ -1390,6 +1513,10 @@ msgstr "Απόκρυψη παλιών"
 msgid "Hide pins"
 msgstr "Απόκρυψη καρφιτσών"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Ιστορικό"
@@ -1421,7 +1548,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1441,6 +1568,10 @@ msgstr ""
 "Κάνε ταυτοποίηση ενός <strong>γονέα</strong> αν αυτός ο τομέας είναι από μόνος του μέρος ενός άλλου τομέα.\n"
 "Για βασικές διαρθρώσεις, δεν χρειάζεται να συνδέσεις τους τομείς μεταξύ τους, με αυτόν τον τρόπο."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1451,7 +1582,7 @@ msgstr "Αν δύο ή περισσότεροι τομείς υπηρετούν
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1511,8 +1642,8 @@ msgstr "Λανθασμένη ID"
 msgid "Illegal feed selection"
 msgstr "Λανθασμένη επιλογή ροής"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1530,7 +1661,9 @@ msgstr "Επιπλέον, θα επιστραφούν οι παρακάτω ιδ
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1548,7 +1681,7 @@ msgstr "Να περιλαμβάνονται οι προσωπικές πληρο
 msgid "Include unconfirmed reports"
 msgstr "Να περιλαμβάνονται μη επιβεβαιωμένες αναφορές"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Εσφαλμένη τιμή has_photo \"%s\""
 
@@ -1556,7 +1689,7 @@ msgstr "Εσφαλμένη τιμή has_photo \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1566,33 +1699,41 @@ msgstr "Εσωτερικές οδηγίες"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Εσωτερική αναφορά"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Εσφαλμένη τιμή agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Λανθασμένη ημερομηνία λήξης"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Λανθασμένη μορφοποίηση %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Λανθασμένη ημερομηνία έναρξης"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1623,6 +1764,15 @@ msgstr "Άγνωστη δικαιοδοσία"
 msgid "Keep me signed in on this computer"
 msgstr "Να παραμείνω συνδεδεμένος από αυτήν τη συσκευή"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Τελευταία ενημέρωση"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1636,11 +1786,12 @@ msgstr "Τελευταία ενημέρωση"
 msgid "Last&nbsp;update:"
 msgstr "Τελευταία&nbsp;ενημέρωση:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1648,6 +1799,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Άφησέ το κενό αν όλες οι αναφορές σε αυτόν τον τομέα πρέπει να στέλνονται με την ίδια μέθοδο αποστολής (π.χ., \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Λίστα όλων των αναφερθέντων προβλημάτων"
@@ -1669,7 +1824,8 @@ msgstr "Τοπικές ροές RSS και ειδοποιήσεις email"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Τοπικές ροές RSS και ειδοποιήσεις email για ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Τοπικές ειδοποιήσεις"
 
@@ -1677,15 +1833,36 @@ msgstr "Τοπικές ειδοποιήσεις"
 msgid "Locate the problem on a map of the area"
 msgstr "Εντόπισε το πρόβλημα στον χάρτη της περιοχής"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "ΧΑΡΤΗΣ"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1709,7 +1886,7 @@ msgstr "Σημείωση ως επιδιορθωμένο/κλειστό μέσα
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Σημείωση ως επιδιορθωμένο/κλειστό πιο πριν από οκτώ εβδομάδες"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1729,7 +1906,7 @@ msgstr "Μήνυμα προς τον εξωτερικό τομέα:"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Λείπει το jurisdiction_id"
 
@@ -1737,7 +1914,7 @@ msgstr "Λείπει το jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1745,15 +1922,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Αναφέρθηκε από %s στις %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Αναφέρθηκε από %s στις %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Ελέγχθηκε από το τμήμα μέσα σε μία εργάσιμη ημέρα"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "άλλες περιοχές:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Μήνας"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1761,7 +1955,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1789,7 +1983,7 @@ msgstr "Όνομα:"
 msgid "Name: %s"
 msgstr "Όνομα: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1798,7 +1992,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)"
 
@@ -1807,7 +2001,7 @@ msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται π
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1891,7 +2085,7 @@ msgstr "Νέα κατάσταση"
 msgid "New template"
 msgstr "Νέο πρότυπο"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1899,6 +2093,7 @@ msgstr ""
 msgid "Next"
 msgstr "Επόμενο"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1927,7 +2122,7 @@ msgstr "Κανένας τομέας"
 msgid "No council"
 msgstr "Καμιά υπηρεσία"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Δεν επιλέχθηκε κάποια υπηρεσία"
 
@@ -1945,6 +2140,8 @@ msgstr "Δε βρέθηκαν επισημασμένοι χρήστες."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1955,6 +2152,14 @@ msgstr "Δεν είναι εφικτή η διόρθωση"
 msgid "No further updates"
 msgstr "Καμία περαιτέρω ενημέρωση"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Δεν επιστράφηκαν αποτελέσματα."
@@ -1998,6 +2203,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2059,6 +2266,14 @@ msgstr "Τώρα, για να υποβάλεις την ενημέρωσή σο
 msgid "OK"
 msgstr "ΟΚ"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Παλιά / άγνωστα <br>προβλήματα"
@@ -2075,7 +2290,7 @@ msgstr "Παλιά <br>διορθωμένα"
 msgid "Older <br>problems"
 msgstr "Παλιά <br>προβλήματα"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2085,7 +2300,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2129,15 +2347,15 @@ msgstr "Ή προβλήματα που αναφέρθηκαν σε:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ή μπορείς να λαμβάνεις ειδοποιήσεις που αφορούν μία συγκεκριμένη υπηρεσία της περιοχής:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Άλλα"
 
@@ -2172,11 +2390,11 @@ msgstr "Κωδικός πρόσβασης (προαιρετικό)"
 msgid "Password:"
 msgstr "Νέος κωδικός πρόσβασης:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Σύνδεσμος"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2243,8 +2461,8 @@ msgstr "Θέση της περιοχής στο χάρτη"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2270,14 +2488,14 @@ msgid "Please check your email address is correct"
 msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Παρακαλούμε επίλεξε μια κατηγορία"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Παρακαλούμε επίλεξε ένα είδος ακινήτου"
 
@@ -2306,8 +2524,8 @@ msgstr "Παρακαλούμε να μην κάνεις κατάχρηση&nbsp;
 msgid "Please enter a message"
 msgstr "Παρακαλούμε γράψε ένα μήνυμα"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Παρακαλώ γράψτε ένα όνομα"
 
@@ -2322,13 +2540,13 @@ msgid "Please enter a password"
 msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Παρακαλούμε γράψε ένα θέμα"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2341,7 +2559,7 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email"
 msgid "Please enter a valid email address"
 msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες"
@@ -2368,14 +2586,14 @@ msgstr "Παρακαλούμε γράψε τη διεύθυνση email σου"
 msgid "Please enter your first name"
 msgstr "Παρακαλούμε γράψε το όνομά σου"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2438,7 +2656,7 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ
 msgid "Please note:"
 msgstr "Παρακαλούμε σημείωσε ότι:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2471,10 +2689,10 @@ msgstr "Παρακαλούμε επίλεξε το είδος της ειδοπ
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Παρακαλούμε ανέβασε μία εικόνα μόνο"
 
@@ -2497,15 +2715,15 @@ msgstr "Δημοσίευση"
 msgid "Posted anonymously at %s"
 msgstr "Δημοσιεύθηκε ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Δημοσιεύθηκε από %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Δημοσιεύθηκε από <strong>%s</strong> (%s) στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Δημοσιεύθηκε από <strong>%s</strong> στις %s"
 
@@ -2521,12 +2739,12 @@ msgstr "Προηγούμενα"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Ιδιωτικότητα"
 
@@ -2569,7 +2787,7 @@ msgstr "Το πρόβλημα %s στάλθηκε στην υπηρεσία %s"
 msgid "Problem breakdown by state"
 msgstr "Ανάλυση προβλήματος ανά κατάσταση"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό."
 
@@ -2577,7 +2795,7 @@ msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό."
 msgid "Problem state change based on survey results"
 msgstr "Αλλαγή κατάστασης προβλήματος βάσει αποτελεσμάτων από έρευνες"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Προβλήματα"
@@ -2598,13 +2816,13 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ
 msgid "Problems within %.1fkm of this location"
 msgstr "Λήψη ειδοποιήσεων για προβλήματα σε ακτίνα %.1f χλμ από εδώ"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Προβλήματα στο &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Προβλήματα στην περιοχή &quot;%s&quot;"
 
@@ -2650,7 +2868,7 @@ msgstr "Δημόσια απάντηση:"
 msgid "Public response:"
 msgstr "Δημόσια απάντηση:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2686,11 +2904,11 @@ msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον
 msgid "RSS feed"
 msgstr "Ροή RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Ροή RSS για &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Ροή RSS για την περιοχή %s, %s"
 
@@ -2698,11 +2916,11 @@ msgstr "Ροή RSS για την περιοχή %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Ροή RSS από %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Ροή RSS από %s, στην περιοχή &quot;%s&quot;"
 
@@ -2710,13 +2928,13 @@ msgstr "Ροή RSS από %s, στην περιοχή &quot;%s&quot;"
 msgid "RSS feed of nearby problems"
 msgstr "Ροή RSS για κοντινά προβλήματα"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Ροή RSS για προβλήματα στο &quot;%s&quot;"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Ροή RSS για προβλήματα στην περιοχή &quot;%s&quot;"
 
@@ -2735,7 +2953,7 @@ msgstr "Ροή RSS για ενημερώσεις σε αυτό το πρόβλη
 msgid "Receive email when updates are left on this problem."
 msgstr "Λήψη email όταν γίνονται ενημερώσεις για αυτό το πρόβλημα"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2753,7 +2971,7 @@ msgstr "Πρόσφατα <br>διορθωμένα"
 msgid "Recently reported problems"
 msgstr "Πρόσφατες αναφορές προβλημάτων"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2792,12 +3010,12 @@ msgid "Report"
 msgstr "Αναφορά"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Αναφορά προβλήματος"
@@ -2815,6 +3033,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Αναφορά στο &quot;%s&quot;"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Αναφέρθηκε:"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2826,7 +3049,7 @@ msgstr "Ανάφερε το πρόβλημά σου"
 msgid "Report, view, or discuss local problems"
 msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλήματα"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Αναφέρθηκε ανώνυμα στις %s"
@@ -2836,7 +3059,7 @@ msgstr "Αναφέρθηκε ανώνυμα στις %s"
 msgid "Reported before"
 msgstr "Αναφέρθηκε προηγουμένως"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Αναφέρθηκε από %s στις %s"
@@ -2850,27 +3073,27 @@ msgstr "Αναφέρθηκε από:"
 msgid "Reported in the %s category"
 msgstr "Αναφέρθηκε στην κατηγορία %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s"
 
@@ -2894,11 +3117,12 @@ msgstr "Αναφορά προβλήματος"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Αναφορές"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Παρακαλούμε συντόμευσε την αναφορά σου"
 
@@ -2906,10 +3130,6 @@ msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Πα
 msgid "Reports awaiting approval"
 msgstr "Αναφορές που αναμένουν έγκριση"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2918,7 +3138,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Αναφορές που δημοσιεύθηκαν"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Αναφορά προβλήματος"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2930,10 +3155,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Επαναποστολή αναφοράς"
@@ -2965,6 +3186,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr "Πρότυπα απαντήσεων για %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2980,15 +3213,15 @@ msgstr "Χειριστής δρόμου για την ονομασμένη οδ
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3000,36 +3233,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Αν περιστρέψετε την φωτογραφία θα χαθούν οι αλλαγές που κάνατε στην αναφορά."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Δορυφόρος"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "σημειωμένη ως διπλή αναφορά"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Αποθήκευση αλλαγών"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Αναζήτηση Αναφορών"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Αναζήτηση Χρηστών"
 
@@ -3056,7 +3297,7 @@ msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3090,7 +3331,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "Επιστροφή αναφοράς"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Στάλθηκε στο %s %s αργότερα"
 
@@ -3103,7 +3344,7 @@ msgstr "Στάλθηκε:"
 msgid "Service:"
 msgstr "Υπηρεσία:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3111,6 +3352,7 @@ msgstr ""
 msgid "Share"
 msgstr "Κοινοποίηση"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3120,6 +3362,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3127,23 +3370,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Προβολή παλαιότερων"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Δημόσια προβολή του ονόματός μου"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Δημόσια προβολή του ονόματός μου"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Προβολή παλαιότερων"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Προβολή παλαιότερων"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Προβολή καρφιτσών"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3183,7 +3446,7 @@ msgstr "Μερικές φωτογραφίες από πρόσφατες αναφ
 msgid "Some text to localize"
 msgstr "Κείμενο για εντοπισμό"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομικός κώδικας είναι  Crown dependency postcode, δεν καλύπτουμε τέτοιους ΤΚ,"
 
@@ -3214,15 +3477,21 @@ msgstr "Λυπούμαστε, δεν μπορούμε να σας συνδέσο
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυτήν την τοποθεσία. Παρακαλούμε προσπάθησε ξανά."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Λυπούμαστε, δεν μπορέσαμε να αποθηκεύσουμε τις εικόνες σας, παρακαλούμε προσπαθήστε ξανά."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3240,12 +3509,12 @@ msgstr "Ημερομηνία Έναρξης:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Κατάσταση"
@@ -3261,7 +3530,7 @@ msgstr "Κατάσταση:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3282,7 +3551,7 @@ msgstr "Ακόμη ανοιχτό, μέσω ερωτηματολογίου, %s"
 msgid "Street View"
 msgstr "Street View"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Υποκατηγορία: %s"
 
@@ -3310,7 +3579,7 @@ msgstr "Υποβολή"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3367,11 +3636,11 @@ msgstr "Περίληψη"
 msgid "Summary reports"
 msgstr "Περιληπτικές αναφορές"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3434,7 +3703,7 @@ msgstr "Ευχαριστούμε που ανέβασες την φωτογραφ
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "Ευχαριστούμε, χαιρόμαστε που διορθώθηκε! Μπορούμε απλά να σε ρωτήσουμε αν έχεις αναφέρει ξανά κάποιο πρόβλημα στην υπηρεσία στο παρελθόν;"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτωθεί σωστά (%s), παρακαλούμε προσπάθησε ξανά."
 
@@ -3448,7 +3717,7 @@ msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται σ
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε."
 
@@ -3612,7 +3881,7 @@ msgstr "Υπήρξε πρόβλημα στην προβολή της σελίδ
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της σελίδας. Παρακαλούμε προσπάθησε αργότερα."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3694,18 +3963,18 @@ msgstr ""
 "Αυτή η υπηρεσία θα δέχεται μόνο αναφορές για προβλήματα που βρίσκονται στην <strong>περιοχή αρμοδιότητας της</strong>.\n"
 "Μια υπηρεσία δεν θα δέχεται καμία αναφορά, εκτός αν είναι αρμόδια για τουλάχιστον μία περιοχή."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Αυτό το email στάλθηκε και στις δύο υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, μιας και ο χρήστης δεν το κατηγοριοποίησε. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος, ή ενημέρωσέ μας για τη σωστή κατηγορία του προβλήματος ώστε να την προσθέσουμε στο σύστημα."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Αυτή η πληροφορία απαιτείται"
 
@@ -3721,14 +3990,19 @@ msgstr "Αυτή είναι μια περίληψη όλων των αναφορ
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Αυτό το πρόβλημα έχει διορθωθεί"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3776,7 +4050,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3807,8 +4081,26 @@ msgstr "Για την προβολή ενός χάρτη με την ακριβ
 msgid "Total"
 msgstr "Σύνολο"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "σημειωμένο ως διορθωμένο"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3816,7 +4108,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3841,7 +4133,8 @@ msgstr "Στείλε μας ένα email:"
 msgid "Unconfirmed"
 msgstr "Ανεπιβεβαίωτο"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "μη διορθωμένες αναφορές"
 
@@ -3865,6 +4158,10 @@ msgstr "Άγνωστο σφάλμα"
 msgid "Unknown problem ID"
 msgstr "Άγνωστη ταυτότητα προβλήματος"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3921,10 +4218,10 @@ msgstr "Καταστάσεις ενημέρωσης"
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3968,26 +4265,32 @@ msgstr "Χάρτης σε χρήση"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Η επισήμανση του χρήστη αφαιρέθηκε"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Ο χρήστης επισημάνθηκε"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "σημειωμένο ως διορθωμένο"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Χρήστες"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4018,6 +4321,15 @@ msgstr "Προβάλλεται μία τοποθεσία"
 msgid "Viewing a problem"
 msgstr "Προβάλλεται ένα πρόβλημα"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Πτέρυγες του συμβουλίου"
@@ -4037,7 +4349,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr "Χρειαζόμαστε το email σου, παρακαλώ γράψ&quot; το παρακάτω."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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. Ωστόσο, μέχρι στιγμής δεν έχουμε πληροφορίες επικοινωνίας μαζί τους. Αν γνωρίζεις μία κατάλληλη διεύθυνση επικοινωνίας, παρακαλούμε επικοινώνησε μαζί τους."
 
@@ -4054,6 +4366,10 @@ msgstr "Θα χρησιμοποιήσουμε τις προσωπικές σου
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Θα σου απαντήσουμε όσο το δυνατόν συντομότερα."
@@ -4071,11 +4387,11 @@ msgstr "Όταν διορθώθηκε"
 msgid "When sent"
 msgstr "Όταν αποστάλθηκε "
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Ήρεμα ρε Τεστίνο! Τρεις φωτογραφίες είναι αρκετές."
 
@@ -4110,10 +4426,16 @@ msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία σ
 msgid "Wrong location? Just click again on the map."
 msgstr "Λάθος γεωγραφική τοποθεσία; Απλά κάνε κλικ ξανά πάνω στον χάρτη."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Έτος"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4142,6 +4464,10 @@ msgstr "Ναι έχω κωδικό πρόσβασης"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλήματος διαγράφτηκε από τον διαχειριστή χωρίς λόγο: "
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:"
@@ -4188,6 +4514,10 @@ msgstr "Μπορείς να επισημάνεις έναν τομέα ως δι
 msgid "You declined; please fill in the box above"
 msgstr "Έχεις υποχωρήσει - παρακαλούμε συμπλήρωσε το κουτί που υπάρχει παραπάνω."
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4249,7 +4579,7 @@ msgid "Your Reports"
 msgstr "Οι Αναφορές σου"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4286,6 +4616,11 @@ msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν 
 msgid "Your name"
 msgstr "Το όνομά σου"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Οι αναφορές σου"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4315,6 +4650,10 @@ msgstr "Οι αναφορές σου"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Οι ενημερώσεις σου"
@@ -4325,7 +4664,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4333,7 +4672,7 @@ msgstr ""
 msgid "by %s"
 msgstr "από %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "σημειωμένη ως διπλή αναφορά"
 
@@ -4361,49 +4700,49 @@ msgstr "επεξεργασία χρήστη"
 msgid "from %s different users"
 msgstr "από %s διαφορετικούς χρήστες"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "τελευταία ενημέρωση %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "λιγότερο από ένα λεπτό"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "σημειωμένη ως προγραμματισμένη δράση"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "σημειωμένη ως εσωτερική αναφορά"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "σημειωμένο ως κλειστό"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "σημειωμένο ως διορθωμένο"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "σημειωμένο ως σε διαδικασία αντιμετώπισης"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "σημειωμένο ως υπό έλεγχο"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "σημειωμένο ως αδύνατο να διορθωθεί"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "σημειωμένο ως προγραμματισμένο"
 
@@ -4414,7 +4753,7 @@ msgid "n/a"
 msgstr "μη διαθέσιμο"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4449,8 +4788,8 @@ msgstr "αναφέρθηκε αρχικά από: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "άλλες περιοχές:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "άνοιξε ξανά"
 
@@ -4471,7 +4810,7 @@ msgstr "η τοπική υπηρεσία"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "δεν υπάρχει καρφίτσα στον χάρτη επειδή ο χρήστης δεν χρησιμοποίησε τον χάρτη"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "αυτή η κατηγορία τοπικού προβλήματος"
 
@@ -4479,6 +4818,16 @@ msgstr "αυτή η κατηγορία τοπικού προβλήματος"
 msgid "today"
 msgstr "σήμερα"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Ενημέρωση"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Ενημερώσεις"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "χάρτης σε χρήση"
@@ -4496,27 +4845,41 @@ msgstr "ο χρήστης είναι ο ιδιοκτήτης του προβλή
 msgid "ward"
 msgstr "πτέρυγα"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ημέρα"
 msgstr[1] "%d ημέρες"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ώρα"
 msgstr[1] "%d ώρες"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d λεπτό"
 msgstr[1] "%d λεπτά"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d λεπτό"
+msgstr[1] "%d λεπτά"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4524,13 +4887,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d υποστηρικτής"
 msgstr[1] "%d υποστηρικτές"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d εβδομάδα"
 msgstr[1] "%d εβδομάδες"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4559,6 +4929,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> ενημέρωση σε αναφορές"
 msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Αναφέρθηκε από %s στις %s"
+msgstr[1] "Αναφέρθηκε από %s στις %s"
+
 #: 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."
@@ -4572,3 +4949,37 @@ 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.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "τελευταία ενημέρωση %s"
+msgstr[1] "τελευταία ενημέρωση %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Αναφορά"
+msgstr[1] "Αναφορά"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Όλες οι Αναφορές"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Εξωτερικός Σύνδεσμος"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Δημιουργία κατηγορίας"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Αναφέρθηκε από %s στις %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "τελευταία ενημέρωση %s"
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index cc9d6ca26..662212e02 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Spanish (Spain) (https://www.transifex.com/mysociety/teams/12067/es_ES/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " y "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s barrio, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, en %s barrio"
 
@@ -154,7 +154,7 @@ msgstr "(arreglado)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
@@ -162,17 +162,17 @@ msgstr "(no enviadas al ayuntamiento)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(enviado a ambos)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Escoja un tipo de propiedad --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong>- permítanme registrarme por email"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -235,6 +251,8 @@ msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -280,15 +298,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -300,6 +318,10 @@ msgstr "Añadido %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Otra vez:"
@@ -316,6 +338,12 @@ msgstr "Alerta %d desactivada (creada %s)"
 msgid "Alert me to future updates"
 msgstr "Notificadme actualizaciones futuras"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -325,12 +353,14 @@ msgstr "Todas las notificaciones"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -365,11 +395,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "¿Eres programador?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -406,7 +437,7 @@ msgstr "Asignar a un órgano externo:"
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -432,15 +463,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
@@ -458,7 +497,7 @@ msgid "Ban email address"
 msgstr "Suspender este email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -467,7 +506,7 @@ msgid "Bodies"
 msgstr "Órganos administrativos"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -495,14 +534,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -513,7 +553,7 @@ msgstr ""
 msgid "Category"
 msgstr "Categoría"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -523,6 +563,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Ratio de arreglo de problemas > 4 semanas"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -530,7 +571,7 @@ msgstr "Ratio de arreglo de problemas > 4 semanas"
 msgid "Category:"
 msgstr "Categoría:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categoría: %s"
 
@@ -598,10 +639,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -632,10 +677,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -643,11 +690,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Cerrada"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Cerrada por el Ayuntamiento"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -673,6 +720,11 @@ msgstr "Datos cobrand:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "mapa utilizado"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -736,8 +788,8 @@ msgstr "Contactar con el equipo"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "No se pudo encontrar el usuario"
 
@@ -755,6 +807,36 @@ msgstr "Ayuntamiento"
 msgid "Council contacts for %s"
 msgstr "Contactos del ayuntamiento para %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "marcado como cerrado"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "marcado como arreglado"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "marcado como en progreso"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "marcado como en investigación"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "marcado como planificado"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Referencia del ayuntamiento:&nbsp;%s"
@@ -779,15 +861,15 @@ msgstr "Crear una notificación"
 msgid "Create category"
 msgstr "Crear una categoría"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -831,7 +913,11 @@ msgstr "Cuadro de mando"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -845,6 +931,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Eliminado"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -881,6 +972,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Ranking de premios a la constancia"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Guardar cambios"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -906,23 +1003,25 @@ msgstr "¿No te gustan los formularios?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicado"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplicado"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplicado"
@@ -938,8 +1037,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -953,28 +1052,28 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1013,7 +1112,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email añadido a lista de abusones"
 
@@ -1031,7 +1130,7 @@ msgstr "Creada alerta de email"
 msgid "Email alert deleted"
 msgstr "Borrada alerta de email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Email ya incluido en la lista de abusones"
 
@@ -1083,7 +1182,7 @@ msgstr "Punto final"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Introduzca un nombre de calle de Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 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"
 
@@ -1117,8 +1216,8 @@ msgstr "Introduzca detalles del problema"
 msgid "Error"
 msgstr "Error"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1132,14 +1231,22 @@ msgid "Examples:"
 msgstr "Ejemplos:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1148,6 +1255,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1168,8 +1276,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1194,10 +1302,12 @@ msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formul
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1205,6 +1315,8 @@ msgstr "Arreglado"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Arreglado - Ayuntamiento"
 
@@ -1213,7 +1325,7 @@ msgstr "Arreglado - Ayuntamiento"
 msgid "Fixed - User"
 msgstr "Arreglado - Usuario"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1222,7 +1334,7 @@ msgid "Fixed:"
 msgstr "Arreglado:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Marcar como borrado"
@@ -1308,11 +1420,13 @@ msgstr "Proporcióname un listado RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "¡Nos alegra saber que ha sido arreglado!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ir"
@@ -1321,11 +1435,11 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Gráfico temporal de creación problemas por estado"
 
@@ -1341,7 +1455,7 @@ msgstr "¿Ha sido corregido este problema?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1366,6 +1480,9 @@ msgstr "%s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1373,6 +1490,11 @@ msgstr "%s"
 msgid "Hidden"
 msgstr "Oculto"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Vuelva a enviar la notificación"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Ocultar antiguos"
@@ -1381,6 +1503,10 @@ msgstr "Ocultar antiguos"
 msgid "Hide pins"
 msgstr "Ocultar marcadores"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historial"
@@ -1412,7 +1538,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "No se ha podido localizar su problema en la base de datos.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1432,6 +1558,10 @@ msgstr ""
 "Identificar una <strong>sub-organismos</ strong> si este organismo forma parte de otro organismo.\n"
 "Para las instalaciones básicas, no necesita asociar los organismos de esta manera."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1444,7 +1574,7 @@ msgstr ""
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1510,8 +1640,8 @@ msgstr "ID incorrecto"
 msgid "Illegal feed selection"
 msgstr "Selección de listado incorrecta"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1529,7 +1659,9 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1547,7 +1679,7 @@ msgstr "Incluir datos del notificador"
 msgid "Include unconfirmed reports"
 msgstr "Incluir notificaciones no confirmadas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valor incorrecto para has_photo \"%s\""
 
@@ -1555,7 +1687,7 @@ msgstr "Valor incorrecto para has_photo \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1565,33 +1697,41 @@ msgstr "Notas internas"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Remisión interna"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Valor inválido para agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Fecha de fin inválida"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Fecha de inicio no válida"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1622,6 +1762,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Mantener mi sesión abierta en este ordenador"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Última actualización:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1635,11 +1784,12 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1647,6 +1797,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo utilizan el mismo método de envío (e.g., \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Listar todos los problemas notificados"
@@ -1668,7 +1822,8 @@ msgstr "Listados RSS locales y alertas por email"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Listados RSS locales y alertas por email para '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Alertas locales"
 
@@ -1676,15 +1831,36 @@ msgstr "Alertas locales"
 msgid "Locate the problem on a map of the area"
 msgstr "Señale en el mapa de la zona la localización del problema"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAPA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1708,7 +1884,7 @@ msgstr "Marcado como resuelto/cerrado en las últimas ocho semanas"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Marcado como resuelto/cerrado hace más de ocho semanas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1728,7 +1904,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
@@ -1736,7 +1912,7 @@ msgstr "Falta jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1744,15 +1920,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Notificado por %s en %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Notificado por %s en %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderado por el organismo durante el siguiente día laborable"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "otras áreas:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1760,7 +1953,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1788,7 +1981,7 @@ msgstr "Nombre:"
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1797,7 +1990,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1806,7 +1999,7 @@ msgstr "Código Postal más cercano al marcador colocado en el mapa (generado au
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1890,7 +2083,7 @@ msgstr "Nuevo estado"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1898,6 +2091,7 @@ msgstr ""
 msgid "Next"
 msgstr "Siguiente"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1926,7 +2120,7 @@ msgstr "Sin órgano administrativo"
 msgid "No council"
 msgstr "Sin ayuntamiento"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -1944,6 +2138,8 @@ msgstr "No se encuentran usuarios marcados"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1954,6 +2150,14 @@ msgstr "Incapaz de arreglarlo"
 msgid "No further updates"
 msgstr "No hay más actualizaciones"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Ningún resultado devuelto"
@@ -2000,6 +2204,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2061,6 +2267,14 @@ msgstr "Ahora a enviar tu notificación&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Problemas<br>Antiguos / desconocidos"
@@ -2077,7 +2291,7 @@ msgstr "Antiguo <br>arreglado"
 msgid "Older <br>problems"
 msgstr "Problemas <br>antiguos"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2087,7 +2301,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2131,15 +2348,15 @@ msgstr "O problemas notificados a:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Otros"
 
@@ -2174,11 +2391,11 @@ msgstr "Contraseña (opcional)"
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Enlace permanente"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2245,8 +2462,8 @@ msgstr "Coloque el marcador en el mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2272,14 +2489,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Por favor, elija un tipo de propiedad"
 
@@ -2305,8 +2522,8 @@ msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ay
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2321,13 +2538,13 @@ msgid "Please enter a password"
 msgstr "Por favor, introduzca una contraseña"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2340,7 +2557,7 @@ 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/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
@@ -2367,14 +2584,14 @@ msgstr "Por favor introduzca su email"
 msgid "Please enter your first name"
 msgstr "Por favor, indique su nombre"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2437,7 +2654,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Por favor, tenga en cuenta:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2470,10 +2687,10 @@ msgstr "Por favor, seleccione el tipo de alerta que desea"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2496,15 +2713,15 @@ msgstr "Publicar"
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Publicado por <strong>%s</strong> (%s) - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Publicado por <strong>%s</strong> - %s"
 
@@ -2520,12 +2737,12 @@ msgstr "Previo"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -2568,7 +2785,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:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problema marcado como abierto."
 
@@ -2576,7 +2793,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -2597,13 +2814,13 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas en %.1fkm alrededor"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemas en %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemas en el barrio %s"
 
@@ -2649,7 +2866,7 @@ msgstr "Respuesta del público:"
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2685,11 +2902,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 msgid "RSS feed"
 msgstr "Listado RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Listado RSS para %s del barrio, %s"
 
@@ -2697,11 +2914,11 @@ msgstr "Listado RSS para %s del barrio, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Listado RSS para %s, en el barrio %s"
 
@@ -2709,13 +2926,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Listado RSS de los problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Listado RSS de los problemas dentro del barrio %s"
 
@@ -2734,7 +2951,7 @@ msgstr "Listado RSS de actualizaciones sobre este problema"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2752,7 +2969,7 @@ msgstr "Recientemente <br>arreglado"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2791,12 +3008,12 @@ msgid "Report"
 msgstr "Notificar"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Notificar un problema"
@@ -2814,6 +3031,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Notificar sobre %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Denunciar abuso"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2825,7 +3047,7 @@ msgstr "Notifique su incidencia"
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
@@ -2835,7 +3057,7 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
@@ -2849,27 +3071,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 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:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 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"
 
@@ -2893,11 +3115,12 @@ msgstr "Notificando un problema"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Notificaciones"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación."
 
@@ -2905,10 +3128,6 @@ msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte
 msgid "Reports awaiting approval"
 msgstr "Informes en espera de aprobación"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2917,7 +3136,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Notificaciones publicadas"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Notificar un problema"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2929,10 +3153,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Vuelva a enviar la notificación"
@@ -2964,6 +3184,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2979,15 +3211,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2999,36 +3231,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "marcado como un informe duplicado"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Buscar Notificaciones"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Buscar Usuarios"
 
@@ -3055,7 +3295,7 @@ msgstr "La búsqueda no encontró usuarios."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3089,7 +3329,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Enviado a %s %s después"
 
@@ -3102,7 +3342,7 @@ msgstr "Enviado:"
 msgid "Service:"
 msgstr "Servicio:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3110,6 +3350,7 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3119,6 +3360,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3126,23 +3368,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Mostrar antiguos"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Mostrar mi nombre públicamente"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Mostrar mi nombre públicamente"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Mostrar antiguos"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Mostrar antiguos"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Mostrar marcadores"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3184,7 +3446,7 @@ msgstr "Algunas fotos de notificaciones recientes"
 msgid "Some text to localize"
 msgstr "Algún texto para localizar"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3215,15 +3477,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3241,12 +3509,12 @@ msgstr "Fecha de inicio:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
@@ -3262,7 +3530,7 @@ msgstr "Estado/Prov.:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3283,7 +3551,7 @@ msgstr "Sigue abierta, a través de cuestionario, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Subcategoria: %s"
 
@@ -3311,7 +3579,7 @@ msgstr "Enviar"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3368,11 +3636,11 @@ msgstr "Resumen"
 msgid "Summary reports"
 msgstr "Resumen de notificaciones"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3435,7 +3703,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así
 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 "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo."
 
@@ -3449,7 +3717,7 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Ese código postal no fue reconocido, lo siento."
 
@@ -3615,7 +3883,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3698,18 +3966,18 @@ msgstr ""
 "A este organismo sólo se enviarán informes de problemas que se encuentran en el <strong>área cubierta</strong>.\n"
 "Un organismo no recibirá ningún informe salvo que represente al menos un área."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Esta información es necesaria"
 
@@ -3725,14 +3993,19 @@ msgstr "Este es un resumen de todos los informes en esta web."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Este problema se ha arreglado"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Este problema no se ha arreglado"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3780,7 +4053,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3811,8 +4084,26 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "marcado como arreglado"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3820,7 +4111,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3845,7 +4136,8 @@ msgstr "Pruebe enviándonos un correo directamente:"
 msgid "Unconfirmed"
 msgstr "Sin confirmar"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3869,6 +4161,10 @@ msgstr "Error desconocido"
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3925,10 +4221,10 @@ msgstr "Actualización de estados"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3972,26 +4268,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Eliminada marca de usuario"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Usuario marcado"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "marcado como arreglado"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4022,6 +4324,15 @@ msgstr "Visualizando una ubicación"
 msgid "Viewing a problem"
 msgstr "Visualizando un problema"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Barrios de este ayuntamiento"
@@ -4041,7 +4352,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Somos conscientes de este problema podría ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos."
 
@@ -4058,6 +4369,10 @@ msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Lamentamos que el problema no esté arreglado. ¿Por qué no prueba a escribir directamente a sus representantes locales?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!"
@@ -4075,11 +4390,11 @@ msgstr "Una vez editada"
 msgid "When sent"
 msgstr "Una vez enviada"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4114,10 +4429,16 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac
 msgid "Wrong location? Just click again on the map."
 msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Año"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4146,6 +4467,10 @@ msgstr "Sí, tengo una contraseña"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o  similar:"
@@ -4192,6 +4517,10 @@ msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activ
 msgid "You declined; please fill in the box above"
 msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4253,7 +4582,7 @@ msgid "Your Reports"
 msgstr "Sus notificaciones"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4290,6 +4619,11 @@ msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/priv
 msgid "Your name"
 msgstr "Su nombre"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Sus notificaciones"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4319,6 +4653,10 @@ msgstr "Sus notificaciones"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Sus actualizaciones"
@@ -4329,7 +4667,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4337,7 +4675,7 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "marcado como un informe duplicado"
 
@@ -4365,49 +4703,49 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultima actualización %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "marcado como una referencia interna"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "marcado como cerrado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "marcado como arreglado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "marcado como en progreso"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "marcado como que no se puede arreglar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
@@ -4418,7 +4756,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4453,8 +4791,8 @@ msgstr "consignados inicialmente:"
 msgid "other areas:"
 msgstr "otras áreas:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "reabierto"
 
@@ -4475,7 +4813,7 @@ msgstr "ayuntamiento"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "no hay marcador porque el usuario no usó el mapa"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "este tipo de problema local"
 
@@ -4483,6 +4821,16 @@ msgstr "este tipo de problema local"
 msgid "today"
 msgstr "hoy"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Actualizar"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Actualizaciones"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "mapa utilizado"
@@ -4500,27 +4848,41 @@ msgstr "El usuario es el propietario del problema"
 msgid "ward"
 msgstr "barrio"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4528,13 +4890,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d simpatizante"
 msgstr[1] "%d simpatizantes"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4563,6 +4932,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> notificaciones actualizadas"
 msgstr[1] "<big>%s</big> notificaciones actualizadas"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Notificado por %s en %s"
+msgstr[1] "Notificado por %s en %s"
+
 #: 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."
@@ -4576,3 +4952,37 @@ 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] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
 msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "ultima actualización %s"
+msgstr[1] "ultima actualización %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Notificar"
+msgstr[1] "Notificar"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Todas las notificaciones"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "URL Externo"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Crear una categoría"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Notificado por %s en %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "ultima actualización %s"
diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 96112f369..a4c029cf4 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the main FixMyStreet code.
 # Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2017-02-02 10:31+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
+"PO-Revision-Date: 2017-03-20 09:52-0400\n"
 "Last-Translator: Robert Lo Bue <rob@applingua.com>, 2017\n"
 "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n"
 "Language: es_DO\n"
@@ -17,9 +16,10 @@ msgstr ""
 "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.0beta4\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " y "
 
@@ -48,7 +48,7 @@ msgstr "%s - Informes de notificación"
 #. ("%s here is the site name")
 #: templates/web/base/admin/navigation.html:3
 msgid "%s admin:"
-msgstr "%es admin:"
+msgstr "%s admin:"
 
 #: templates/web/base/status/stats.html:26
 msgid "%s bodies"
@@ -111,11 +111,11 @@ msgstr ""
 "council&amp;rsquo;s, pero solo aparecerá en la alerta \"Dentro de la frontera\"\n"
 "para el ayuntamiento del municipio."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s barrio, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, en %s barrio"
 
@@ -163,7 +163,7 @@ msgstr "(arreglado)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(no enviadas al ayuntamiento)"
 
@@ -171,17 +171,17 @@ msgstr "(no enviadas al ayuntamiento)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(enviado a ambos)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Escoja una categoría --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Escoja un tipo de propiedad --"
 
@@ -193,6 +193,14 @@ msgstr "--Elija una plantilla--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr "Un bache de 25 centímetros en Calle Ejemplo, cerca al buzón de correos"
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr "14 - 30 días de antigüedad"
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr "7 - 14 días de antigüedad"
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -204,12 +212,21 @@ msgstr ""
 "Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n"
 "Por favor añada <code>MAPIT_TYPES</code> en su archivo de configuración."
 
+#: templates/web/base/dashboard/index.html:15
+#, fuzzy
+msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
+msgstr "Reportes, Estadísticas y Acciones para"
+
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -228,11 +245,11 @@ msgstr "<strong>No</strong>- confirmar mi actualización por email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong>- permítanme registrarme por email"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 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."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 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."
 
@@ -244,6 +261,8 @@ msgstr "<strong>Sí</strong>- tengo una contraseña"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -289,15 +308,15 @@ msgstr "Añadir a la lista de pre-seleccionados"
 msgid "Add user"
 msgstr "Añadir un usuario"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Añadir/editar las categorias del problema"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Añadir/Editar las prioridades de respuesta"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Añadir/Editar las plantillas de respuesta"
 
@@ -309,6 +328,10 @@ msgstr "Añadido %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados."
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr "Administración"
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Otra vez:"
@@ -325,6 +348,13 @@ msgstr "Alerta %d desactivada (creada %s)"
 msgid "Alert me to future updates"
 msgstr "Notificadme actualizaciones futuras"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "todo"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -334,12 +364,14 @@ msgstr "Todas las notificaciones"
 msgid "All Reports as CSV"
 msgstr "Todos los informes como CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Todas las categorías"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -374,11 +406,12 @@ msgstr "Otro usuario"
 msgid "Are you a developer?"
 msgstr "¿Es usted programador(a)?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "¿Está seguro(a) que quiere cancelar esta carga?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "¿Está seguro(a)?"
@@ -415,7 +448,7 @@ msgstr "Asignar a un órgano externo:"
 msgid "Assign to subdivision:"
 msgstr "Asigne a la subdivisión:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr "Asignar usuarios a las áreas"
 
@@ -441,15 +474,23 @@ msgid "Auto-response:"
 msgstr "Respuesta automática:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Categorías disponibles"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr "El tiempo promedio de arreglar un problema (en días)"
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr "El tiempo promedio del primero cambio del estado "
+
 #: templates/web/base/report/new/after_photo.html:6
 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:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En espera de revisión"
@@ -467,7 +508,7 @@ msgid "Ban email address"
 msgstr "Suspender este email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -476,7 +517,7 @@ msgid "Bodies"
 msgstr "Órganos administrativos"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -492,7 +533,7 @@ msgstr "Por Fecha"
 
 #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
 msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr "¿No puede&rsquo;t encontrar nuestro email? Busque en su folder de email basura&nbsp;&ndash; esa&rsquo;s la solución 99% del tiempo."
+msgstr "¿No puedes encontrar nuestro email? Busque en su folder de email basura&nbsp;&ndash; esa es la solución 99% del tiempo."
 
 #: templates/web/base/around/_report_banner.html:5
 msgid "Can't see the map? <em>Skip this step</em>"
@@ -504,14 +545,15 @@ msgid "Categories"
 msgstr "Categorías"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Categorías:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -522,7 +564,7 @@ msgstr "Categorías:"
 msgid "Category"
 msgstr "Categoría"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categoría cambiada de ‘%s’ a ‘%s’"
 
@@ -532,6 +574,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Ratio de arreglo de problemas > 4 semanas"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -539,7 +582,7 @@ msgstr "Ratio de arreglo de problemas > 4 semanas"
 msgid "Category:"
 msgstr "Categoría:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categoría: %s"
 
@@ -566,7 +609,7 @@ msgid ""
 "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
 "                If you are not sure of the origin or validity of the contact, leave this unchecked."
 msgstr ""
-"Marcar <strong>confirmado</ strong> para indicar que este contacto se ha confirmado como correcto.\n"
+"Marcar <strong>confirmado</strong> para indicar que este contacto se ha confirmado como correcto.\n"
 "Si no está seguro del origen o la validez del contacto, deje esta casilla sin marcar."
 
 #: templates/web/base/admin/contact-form.html:52
@@ -574,7 +617,7 @@ msgid ""
 "Check <strong>deleted</strong> to remove the category from use. \n"
 "        It will not appear as an available category in the drop-down menu on the report-a-problem page."
 msgstr ""
-"Marcar <strong>borrado</ strong> para dejar de usar la categoría. \n"
+"Marcar <strong>borrado</strong> para dejar de usar la categoría. \n"
 "Dejará de aparecer en el menú desplegable que se muestra al notificar los problemas."
 
 #: templates/web/base/admin/contact-form.html:79
@@ -607,14 +650,18 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
-msgstr ""
+msgstr "Elija otro"
+
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr "Eliminar datos sin conexión"
 
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
-msgstr "Haga click aqui o introduzca dd/mm/yyyy"
+msgstr "Haga clic aqui o introduzca dd/mm/yyyy"
 
 #: templates/web/base/around/_report_banner.html:2
 msgid "Click map to report a problem"
@@ -622,29 +669,31 @@ msgstr "Haga clic en el mapa para notificar un problema"
 
 #: templates/web/base/email_sent.html:13
 msgid "Click the link in our confirmation email to activate your alert."
-msgstr "Haga un click en nuestro email de confirmación para activar su alerta."
+msgstr "Haga un clic en nuestro email de confirmación para activar su alerta."
 
 #: templates/web/base/email_sent.html:9
 msgid "Click the link in our confirmation email to publish your problem."
-msgstr "Haga un click en nuestro email de confirmación para publicar su problema."
+msgstr "Haga un clic en nuestro email de confirmación para publicar su problema."
 
 #: templates/web/base/email_sent.html:11
 msgid "Click the link in our confirmation email to publish your update."
-msgstr "Haga un click en nuestro email de confirmación para publicar su actualización."
+msgstr "Haga un clic en nuestro email de confirmación para publicar su actualización."
 
 #: templates/web/base/auth/token.html:18
 msgid "Click the link in our confirmation email to sign in."
-msgstr "Haga un click en nuestro email de confirmación para iniciar sesión."
+msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión."
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:189
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -652,11 +701,11 @@ msgstr "Haga un click en nuestro email de confirmación para iniciar sesión."
 msgid "Closed"
 msgstr "Cerrada"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Cerrada por el Ayuntamiento"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "Informes cerrados"
 
@@ -682,6 +731,11 @@ msgstr "Datos cobrand:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Mapa usado"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -745,8 +799,8 @@ msgstr "Contactar con el equipo"
 msgid "Coordinates:"
 msgstr "Coordenadas:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "No se pudo encontrar el usuario"
 
@@ -764,6 +818,36 @@ msgstr "Ayuntamiento"
 msgid "Council contacts for %s"
 msgstr "Contactos del ayuntamiento para %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "marcado como cerrado"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "marcado como arreglado"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "marcado como en progreso"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "marcado como en investigación"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "marcado como planificado"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Referencia del ayuntamiento:&nbsp;%s"
@@ -788,15 +872,15 @@ msgstr "Crear una notificación"
 msgid "Create category"
 msgstr "Crear una categoría"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "Crear prioridad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr "Crear informes/actualizaciones como ayuntamiento"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr "Crear informes/actualizaciones en nombre del usuario"
 
@@ -834,13 +918,17 @@ msgstr "Cliente imposible de contactar"
 #: templates/web/base/dashboard/index.html:5
 #: templates/web/base/dashboard/index.html:7
 msgid "Dashboard"
-msgstr "Cuadro de mando"
+msgstr "Tablero de control"
 
 #: templates/web/zurich/admin/stats.html:35
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratado por el departamento dentro de los 5 días hábiles"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr "Tipo de defecto"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -854,6 +942,11 @@ msgstr "Eliminar plantilla"
 msgid "Deleted"
 msgstr "Eliminado"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr "Describe el motivo de la moderación"
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -890,6 +983,11 @@ msgstr "No usó el mapa"
 msgid "Diligency prize league table"
 msgstr "Ranking de premios a la constancia"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+msgid "Discard changes"
+msgstr "Desechar cambios"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "No enviar alertas por email en los comentarios recopilados para el creador del problema"
@@ -915,23 +1013,25 @@ msgstr "¿No te gustan los formularios?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
-msgstr "Deslice y deje las fotos aquí o <u>haga click para subir</u>"
+msgstr "Deslice y deje las fotos aquí o <u>haga clic para subir</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicado"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplicado"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplicado"
@@ -947,8 +1047,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr "Falso este/Falso norte:"
 
@@ -962,28 +1062,28 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Editar los detalles del órgano administrativo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "Editar los detalles de otros usuarios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "Editar los permisos de otros usuarios"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "Editar la categoría del informe"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "Editar la prioridad del informe"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "Editar los informes"
 
@@ -1022,7 +1122,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email añadido a lista de abusones"
 
@@ -1040,7 +1140,7 @@ msgstr "Creada alerta de email"
 msgid "Email alert deleted"
 msgstr "Borrada alerta de email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Email ya incluido en la lista de abusones"
 
@@ -1076,7 +1176,7 @@ msgid ""
 "          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 ""
-"Activar <strong>puede ser transferido</ strong> para establecer si uno o más contactos del órgano administrativo\n"
+"Activar <strong>puede ser transferido</strong> para establecer si uno o más contactos del órgano administrativo\n"
 "tienen diferentes vías para recibir (y enviar) actualizaciones. Por ejemplo, si los informes para algunas categorías de \n"
 "incidencia deben ser enviadas por correo electrónico, mientras que otros pueden ser enviados a través Open311."
 
@@ -1092,7 +1192,7 @@ msgstr "Punto final"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Introduzca un nombre de calle de Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 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"
 
@@ -1126,8 +1226,8 @@ msgstr "Introduzca detalles del problema"
 msgid "Error"
 msgstr "Error"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Todo"
 
@@ -1141,14 +1241,23 @@ msgid "Examples:"
 msgstr "Ejemplos:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "Categoría existente"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Explicar el problema"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Todos los informes como CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1157,6 +1266,7 @@ msgid "Extern"
 msgstr "Externo"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "ID externo"
 
@@ -1177,8 +1287,8 @@ msgstr "Equipo externo"
 msgid "Extra data:"
 msgstr "Datos adicionales:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "Detalles adicionales"
 
@@ -1197,16 +1307,18 @@ msgstr "Primera vez"
 
 #: templates/web/base/admin/body.html:52
 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."
+msgstr "Arreglar esto eligiendo un <strong>área cubierta</strong> en el formulario <em>Editar detalles del organismo</em> a continuación."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1214,6 +1326,8 @@ msgstr "Arreglado"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Arreglado - Ayuntamiento"
 
@@ -1222,7 +1336,7 @@ msgstr "Arreglado - Ayuntamiento"
 msgid "Fixed - User"
 msgstr "Arreglado - Usuario"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "Informes arreglados"
 
@@ -1231,7 +1345,7 @@ msgid "Fixed:"
 msgstr "Arreglado:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Marcar como borrado"
@@ -1317,11 +1431,13 @@ msgstr "Proporcióname un listado RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "¡Nos alegra saber que ha sido arreglado!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ir"
@@ -1330,11 +1446,11 @@ msgstr "Ir"
 msgid "Going to send questionnaire?"
 msgstr "¿Va a enviar cuestionario?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "Permitir el acceso al administrador"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Gráfico temporal de creación problemas por estado"
 
@@ -1350,7 +1466,7 @@ msgstr "¿Ha sido corregido este problema?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1375,6 +1491,9 @@ msgstr "%s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1382,6 +1501,10 @@ msgstr "%s"
 msgid "Hidden"
 msgstr "Oculto"
 
+#: templates/web/base/report/_main.html:105
+msgid "Hide entire report"
+msgstr "Ocultar el reporte entero"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Ocultar antiguos"
@@ -1390,6 +1513,10 @@ msgstr "Ocultar antiguos"
 msgid "Hide pins"
 msgstr "Ocultar marcadores"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr "Ocultar actualización entero"
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historial"
@@ -1421,7 +1548,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "No se ha podido localizar su problema en la base de datos.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1438,9 +1565,13 @@ 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 ""
-"Identificar una <strong>sub-organismos</ strong> si este organismo forma parte de otro organismo.\n"
+"Identificar una <strong>sub-organismos</strong> si este organismo forma parte de otro organismo.\n"
 "Para las instalaciones básicas, no necesita asociar los organismos de esta manera."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1453,7 +1584,7 @@ msgstr ""
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 "Si quiere que esta prioridad sea una opción para categorías específicas, elíjalas aquí.  Como valor predeterminado se mostrarán todas las categorías."
 
@@ -1480,7 +1611,7 @@ msgstr ""
 
 #: templates/web/base/admin/contact-form.html:30
 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í."
+msgstr "Si utiliza <strong> un método de envío distinto del email</strong>, introduzca el ID de servicio (Open311) o identificador equivalente aquí."
 
 #: templates/web/base/admin/open311-form-fields.html:100
 #: templates/web/base/admin/open311-form-fields.html:101
@@ -1490,7 +1621,7 @@ msgid ""
 "          Check that your cobrand supports this feature before switching it on."
 msgstr ""
 "Si ha habilitado \"Open311 envío de actualizaciones\", tenga en cuenta que Open311 normalmente sólo acepta el estado ABIERTO o CERRADO en\n"
-"sus actualizaciones. Active <strong>Open311 extensión de status</ strong> si desea permitir que los estados adicionales sean también transferidos.\n"
+"sus actualizaciones. Active <strong>Open311 extensión de status</strong> si desea permitir que los estados adicionales sean también transferidos.\n"
 "Compruebe que su cobrand admite esta función antes de activarlo."
 
 #: templates/web/base/admin/open311-form-fields.html:87
@@ -1500,7 +1631,7 @@ msgid ""
 "          if you do <strong>not</strong> want that user to be notified whenever these updates are created."
 msgstr ""
 "Si ha habilitado \"Open311 envío de actualizaciones\", active <strong>suprimir alertas</strong>\n"
-"si <strong>NO</ strong> deseas que el usuario sea notificado cada vez que se cree uno de estos updates."
+"si <strong>NO</strong> deseas que el usuario sea notificado cada vez que se cree uno de estos updates."
 
 #: templates/web/base/admin/open311-form-fields.html:70
 #: templates/web/base/admin/open311-form-fields.html:71
@@ -1510,7 +1641,7 @@ msgid ""
 "          when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 "Si ha habilitado \"Open311 envío de actualizaciones\", debe identificar qué \n"
-"<strong>usuario</ strong> de FixMyStreet aparece como creador de dichas actualizaciones\n"
+"<strong>usuario</strong> de FixMyStreet aparece como creador de dichas actualizaciones\n"
 "en esta web. Introduzca el ID (número) del usuario."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:133
@@ -1521,8 +1652,8 @@ msgstr "ID incorrecto"
 msgid "Illegal feed selection"
 msgstr "Selección de listado incorrecta"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1540,7 +1671,9 @@ msgstr "Los siguientes atributos, que no forman parte de la especificación Open
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1558,7 +1691,7 @@ msgstr "Incluir datos del notificador"
 msgid "Include unconfirmed reports"
 msgstr "Incluir notificaciones no confirmadas"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valor incorrecto para has_photo \"%s\""
 
@@ -1566,7 +1699,7 @@ msgstr "Valor incorrecto para has_photo \"%s\""
 msgid "Inspection required"
 msgstr "Inspección requerida"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "Dar instrucciones a los contratistas para que solucionen los problemas"
 
@@ -1576,33 +1709,41 @@ msgstr "Notas internas"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Remisión interna"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr "Fallo de Internet"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Valor inválido para agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Fecha de fin inválida"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Especificado un formato no válido %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Fecha de inicio no válida"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1633,6 +1774,15 @@ msgstr "Jurisdicción desconocida"
 msgid "Keep me signed in on this computer"
 msgstr "Mantener mi sesión abierta en este ordenador"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr "Hace 4 semanas"
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Última actualización:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1646,11 +1796,12 @@ msgstr "Última actualización:"
 msgid "Last&nbsp;update:"
 msgstr "Última&nbsp;actualización:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
-msgstr ""
+msgstr "Latitud/Longitud:"
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr "Menos recientemente actualizado"
 
@@ -1658,6 +1809,10 @@ msgstr "Menos recientemente actualizado"
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo utilizan el mismo método de envío (e.g., \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr "Menos de 7 días de antigüedad"
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Listar todos los problemas notificados"
@@ -1679,7 +1834,8 @@ msgstr "Listados RSS locales y alertas por email"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Listados RSS locales y alertas por email para '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Alertas locales"
 
@@ -1687,15 +1843,36 @@ msgstr "Alertas locales"
 msgid "Locate the problem on a map of the area"
 msgstr "Señale en el mapa de la zona la localización del problema"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr "Iniciar sesión con Facebook"
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr "Iniciar sesión con Twitter"
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr "Iniciar sesión con email"
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr "Buscar"
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAPA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr "Administrar los pre-seleccionados"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1719,7 +1896,7 @@ msgstr "Marcado como resuelto/cerrado en las últimas ocho semanas"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Marcado como resuelto/cerrado hace más de ocho semanas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr "Marcar los detalles del problema"
 
@@ -1739,7 +1916,7 @@ msgstr "Mensaje al organismo administrativo externo:"
 msgid "Missing bodies:"
 msgstr "Organismos administrativos perdidos:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Falta jurisdiction_id"
 
@@ -1747,7 +1924,7 @@ msgstr "Falta jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr "Moderar los detalles del informe"
 
@@ -1755,15 +1932,29 @@ msgstr "Moderar los detalles del informe"
 msgid "Moderate this report"
 msgstr "Moderar este informe"
 
+#: templates/web/base/report/update.html:12
+msgid "Moderate this update"
+msgstr "Moderar este actualización"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+msgid "Moderated by %s at %s"
+msgstr "Moderado por %s a %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderado por el organismo durante el siguiente día laborable"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr "Motivo de moderación"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mes"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "Lo más comentado"
 
@@ -1771,7 +1962,7 @@ msgstr "Lo más comentado"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1799,7 +1990,7 @@ msgstr "Nombre:"
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr "Navegue a este problema"
 
@@ -1808,7 +1999,7 @@ msgstr "Navegue a este problema"
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1817,7 +2008,7 @@ msgstr "Código Postal más cercano al marcador colocado en el mapa (generado au
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1901,7 +2092,7 @@ msgstr "Nuevo estado"
 msgid "New template"
 msgstr "Plantilla nueva"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "Lo más reciente"
 
@@ -1909,6 +2100,7 @@ msgstr "Lo más reciente"
 msgid "Next"
 msgstr "Siguiente"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1937,7 +2129,7 @@ msgstr "Sin órgano administrativo"
 msgid "No council"
 msgstr "Sin ayuntamiento"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ningún ayuntamiento seleccionado"
 
@@ -1955,6 +2147,8 @@ msgstr "No se encuentran usuarios marcados"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1965,6 +2159,14 @@ msgstr "Incapaz de arreglarlo"
 msgid "No further updates"
 msgstr "No hay más actualizaciones"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Ningún resultado devuelto"
@@ -1975,7 +2177,7 @@ 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 ""
-"No hay áreas específicas disponibles en la actualidad, debido a que el <code>MAPIT_URL</ code> en\n"
+"No hay áreas específicas disponibles en la actualidad, debido a que el <code>MAPIT_URL</code> en\n"
 "su archivo de configuración no está apuntando a un servicio MapIt activo."
 
 #: templates/web/base/report/_support.html:2
@@ -2006,13 +2208,15 @@ msgid ""
 "                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 ""
-"Normalmente los usuarios (públicos) no deben estar asociados con ningún <strong>organismo</ strong>. <br>\n"
+"Normalmente los usuarios (públicos) no deben estar asociados con ningún <strong>organismo</strong>. <br>\n"
 "El personal autorizado puede ser asociado al organismo administrativo que representan. <br>\n"
 "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/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2074,6 +2278,14 @@ msgstr "Ahora a enviar tu notificación&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr "Datos sin conexión eliminados"
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Problemas<br>Antiguos / desconocidos"
@@ -2090,7 +2302,7 @@ msgstr "Antiguo <br>arreglado"
 msgid "Older <br>problems"
 msgstr "Problemas <br>antiguos"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "Lo más antiguo"
 
@@ -2100,7 +2312,10 @@ msgstr "Lo más antiguo"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2144,15 +2359,15 @@ msgstr "O problemas notificados a:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Otros"
 
@@ -2187,11 +2402,11 @@ msgstr "Contraseña (opcional)"
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Enlace permanente"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "Licencias:"
 
@@ -2258,8 +2473,8 @@ msgstr "Coloque el marcador en el mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2285,14 +2500,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Por favor, elija una categoría"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Por favor, elija un tipo de propiedad"
 
@@ -2318,8 +2533,8 @@ msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ay
 msgid "Please enter a message"
 msgstr "Por favor escriba su mensaje."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Por favor, indique un nombre"
 
@@ -2334,13 +2549,13 @@ msgid "Please enter a password"
 msgstr "Por favor, introduzca una contraseña"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor, introduzca un título"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2353,7 +2568,7 @@ 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/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, describa los detalles más relevantes"
@@ -2380,14 +2595,14 @@ msgstr "Por favor introduzca su email"
 msgid "Please enter your first name"
 msgstr "Por favor, indique su nombre"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2450,7 +2665,7 @@ 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:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr "Por favor, proveer una actualización pública para este reporte."
 
@@ -2483,10 +2698,10 @@ msgstr "Por favor, seleccione el tipo de alerta que desea"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique si el problema se ha solucionado"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Por favor, suba solo una imagen"
 
@@ -2509,15 +2724,15 @@ msgstr "Publicar"
 msgid "Posted anonymously at %s"
 msgstr "Publicado de forma anónima - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Publicado por %s - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Publicado por <strong>%s</strong> (%s) - %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Publicado por <strong>%s</strong> - %s"
 
@@ -2533,12 +2748,12 @@ msgstr "Previo"
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "Prioridad"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Privacidad"
 
@@ -2555,9 +2770,8 @@ msgid "Private"
 msgstr "Privado"
 
 #: templates/web/base/report/new/form_user.html:1
-#, fuzzy
 msgid "Private details"
-msgstr "Detalles adicionales"
+msgstr "Detalles privado"
 
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
@@ -2581,7 +2795,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:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problema marcado como abierto."
 
@@ -2589,7 +2803,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -2610,13 +2824,13 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas en %.1fkm alrededor"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemas en %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemas en el barrio %s"
 
@@ -2653,16 +2867,15 @@ msgid "Providing a password is optional, but doing so will allow you to more eas
 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."
 
 #: templates/web/base/report/new/form_report.html:10
-#, fuzzy
 msgid "Public details"
-msgstr "Actualización pública:"
+msgstr "Detalles públicos"
 
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
 msgid "Public response:"
 msgstr "Respuesta del público:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr "Actualización pública:"
 
@@ -2698,11 +2911,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
 msgid "RSS feed"
 msgstr "Listado RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Listado RSS para %s del barrio, %s"
 
@@ -2710,11 +2923,11 @@ msgstr "Listado RSS para %s del barrio, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Listado RSS para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Listado RSS para %s, en el barrio %s"
 
@@ -2722,13 +2935,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Listado RSS de los problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Listado RSS de los problemas dentro del barrio %s"
 
@@ -2747,7 +2960,7 @@ msgstr "Listado RSS de actualizaciones sobre este problema"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr "Recibido por unos %s momentos tarde"
 
@@ -2765,7 +2978,7 @@ msgstr "Recientemente <br>arreglado"
 msgid "Recently reported problems"
 msgstr "Problemas recientemente notificados"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr "Recientemente actualizado"
 
@@ -2804,12 +3017,12 @@ msgid "Report"
 msgstr "Notificar"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "ID del informe:"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Notificar un problema"
@@ -2827,6 +3040,11 @@ msgstr "Notificar como:"
 msgid "Report on %s"
 msgstr "Notificar sobre %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Notificar como:"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2838,7 +3056,7 @@ msgstr "Notifique su incidencia"
 msgid "Report, view, or discuss local problems"
 msgstr "Notifique, consulte o discuta problemas locales"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Notificado anónimamente en %s"
@@ -2848,7 +3066,7 @@ msgstr "Notificado anónimamente en %s"
 msgid "Reported before"
 msgstr "Notificado con anterioridad"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Notificado por %s en %s"
@@ -2862,27 +3080,27 @@ msgstr "Notificado por:"
 msgid "Reported in the %s category"
 msgstr "Notificado en la categoría %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 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:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Notificado anónimamente vía %s  en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Notificado vía %s por %s en %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 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"
 
@@ -2906,11 +3124,12 @@ msgstr "Notificando un problema"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Informes"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación."
 
@@ -2918,10 +3137,6 @@ msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte
 msgid "Reports awaiting approval"
 msgstr "Informes en espera de aprobación"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr "Los informes de usuarios con una reputación suficientemente alta serán enviados inmediatamente sin requerir inspección.  Cada umbral de categoría puede ser administrado en su página de edición.  Los usuarios ganan reputación cuando un reporte que hayan hecho sea marcado como inspeccionado por los inspectores."
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr "Lo informes hechos por usuarios acreditados serán enviados al organismo administrativo responsable sin ser antes inspeccionados."
@@ -2930,7 +3145,12 @@ msgstr "Lo informes hechos por usuarios acreditados serán enviados al organismo
 msgid "Reports published"
 msgstr "Notificaciones publicadas"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Notificar un problema"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr "Informes esperando a ser enviados"
 
@@ -2942,10 +3162,6 @@ msgstr "Los informes serán automáticamente enviados sin necesidad de verificar
 msgid "Reputation threshold"
 msgstr "Umbral de reputación"
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr "Reputación:"
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Vuelva a enviar la notificación"
@@ -2977,6 +3193,18 @@ msgstr "Plantillas de respuesta"
 msgid "Response Templates for %s"
 msgstr "Plantillas de respuesta por %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr "Volver al texto original"
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr "Volver al texto original"
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr "Volver al titulo original"
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2992,15 +3220,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador responsable de este camino (de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotar a la izquierda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3012,36 +3240,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rotar esta foto eliminará los cambios no guardados al informe."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satélite"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "marcado como un informe duplicado"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr "Guardar con una actualización pública"
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr "Guardando reportes sin conexión"
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Buscar Notificaciones"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Buscar Usuarios"
 
@@ -3068,7 +3304,7 @@ msgstr "La búsqueda no encontró usuarios."
 msgid "See our privacy policy"
 msgstr "Ver nuestra política de privacidad"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 #, fuzzy
 msgid "See user detail for reports created as the council"
 msgstr "Crear informes/actualizaciones como ayuntamiento"
@@ -3103,7 +3339,7 @@ msgstr "Enviar estados Open311 extendidos con actualizaciones de pedidos de serv
 msgid "Sent report back"
 msgstr "Devolver el informe"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Enviado a %s %s después"
 
@@ -3116,7 +3352,7 @@ msgstr "Enviado:"
 msgid "Service:"
 msgstr "Servicio:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr "Ajustar a mi ubicación actual"
 
@@ -3124,6 +3360,7 @@ msgstr "Ajustar a mi ubicación actual"
 msgid "Share"
 msgstr "Compartir"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3133,6 +3370,7 @@ msgstr "Pre-seleccionados"
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr "Entre los pre-seleccionados"
 
@@ -3140,23 +3378,40 @@ msgstr "Entre los pre-seleccionados"
 msgid "Shortlisted by %s"
 msgstr "Pre-seleecionados por %s"
 
+#: templates/web/base/report/update.html:20
+msgid "Show Photo?"
+msgstr "Mostrar foto"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Mostrar mi nombre públicamente"
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr "Mostrar el nombre públicamente"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Mostrar antiguos"
 
+#: templates/web/base/report/_main.html:79
+msgid "Show photo"
+msgstr "Mostrar foto"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Mostrar marcadores"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr "Mostrar el nombre del reportero"
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3186,7 +3441,7 @@ msgid ""
 "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
 "          sent from your FixMyStreet installation."
 msgstr ""
-"Algunos puntos finales requieren una clave de <strong>API</ strong> para indicar que las notificaciones provienen\n"
+"Algunos puntos finales requieren una clave de <strong>API</strong> para indicar que las notificaciones provienen\n"
 "de tu sistema FixMyStreet."
 
 #: templates/web/base/alert/index.html:40
@@ -3198,7 +3453,7 @@ msgstr "Algunas fotos de notificaciones recientes"
 msgid "Some text to localize"
 msgstr "Algún texto para localizar"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3229,15 +3484,21 @@ msgstr "Lo sentimos, pero pudimos iniciar la sesión.  Por favor, llena el sigui
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Lo sentimos, no pudimos guardar su(s) imagen(es), por favor inténtelo de nuevo."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr "Disculpa, no tenemos una buena conexión de internet para grabar este página, o no encontremos la página, o era un fallo del servidor. Por favor, inténtalo de nuevo más tarde."
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr "Lo sentimos, no tiene permiso para hacer eso."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr "Seleccionado por"
 
@@ -3255,12 +3516,12 @@ msgstr "Fecha de inicio:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
@@ -3276,7 +3537,7 @@ msgstr "Estado/Prov.:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3297,7 +3558,7 @@ msgstr "Sigue abierta, a través de cuestionario, %s"
 msgid "Street View"
 msgstr "Vista de calle"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Subcategoria: %s"
 
@@ -3325,7 +3586,7 @@ msgstr "Enviar"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3382,11 +3643,11 @@ msgstr "Resumen"
 msgid "Summary reports"
 msgstr "Resumen de notificaciones"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr "Súperusuario:"
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 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."
 
@@ -3449,7 +3710,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así
 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 "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo."
 
@@ -3463,7 +3724,7 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Ese código postal no fue reconocido, lo siento."
 
@@ -3611,7 +3872,7 @@ 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 ""
-"El usuario <strong>name</ strong> aparece públicamente en los informes que no han sido marcados como <em>anónimos</em>.\n"
+"El usuario <strong>name</strong> aparece públicamente en los informes que no han sido marcados como <em>anónimos</em>.\n"
 "Los nombres no son necesariamente únicos."
 
 #: templates/web/base/around/on_map_list_items.html:12
@@ -3629,7 +3890,7 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3662,7 +3923,7 @@ msgid ""
 "           "
 msgstr ""
 "Estos ajustes son para los organismos que utilizan Open311 (u otra integración back-end) para recibir las incidencias.<br>\n"
-"<Strong>Usted no tiene necesidad de hacerlo si el Método de Envío es por correo electrónico.</ Strong>.\n"
+"<strong>Usted no tiene necesidad de hacerlo si el Método de Envío es por correo electrónico.</strong>.\n"
 "Para obtener más información sobre Open311, consulte\n"
 "<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>este documento</a>."
 
@@ -3674,7 +3935,7 @@ msgstr "Estos serán publicados online para que otros los vean: de acuerdo con n
 #: templates/web/base/report/new/councils_text_all.html:4
 #: templates/web/base/report/new/councils_text_all.html:6
 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 "Estos serán enviados a <strong>%s</strong> y también publicados online para que otros los vean, de acuerdo a nuestra <a href=\"%s\">política de privacidad</a>."
+msgstr "Estos serán enviados al <strong>%s</strong> y también publicados online para que otros los vean, de acuerdo a nuestra <a href=\"%s\">política de privacidad</a>."
 
 #: templates/web/base/report/new/councils_text_private.html:5
 #: templates/web/base/report/new/form_user.html:4
@@ -3695,9 +3956,9 @@ 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 organismo no cubre ninguna zona. Esto significa que no tiene jurisdicción sobre los problemas reportados <em>en ninguna ubicación</ em>. \n"
+"Este organismo no cubre ninguna zona. Esto significa que no tiene jurisdicción sobre los problemas reportados <em>en ninguna ubicación</em>. \n"
 "En consecuencia, ninguna de sus categorías aparecerá en el menú desplegable de categorías cuando los usuarios envíen incidencias.\n"
-"Actualmente, los usuarios <strong>no pueden informar de problemas a este organismo</ strong>."
+"Actualmente, los usuarios <strong>no pueden informar de problemas a este organismo</strong>."
 
 #: templates/web/base/admin/body.html:58
 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
@@ -3712,18 +3973,18 @@ msgstr ""
 "A este organismo sólo se enviarán informes de problemas que se encuentran en el <strong>área cubierta</strong>.\n"
 "Un organismo no recibirá ningún informe salvo que represente al menos un área."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Esta información es necesaria"
 
@@ -3739,17 +4000,22 @@ msgstr "Este es un resumen de todos los informes en esta web."
 msgid "This pothole has been here for two months and…"
 msgstr "Este bache ha estado aquí dos meses y ..."
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Este problema se ha arreglado"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Este problema no se ha arreglado"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Este problema no se ha arreglado"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
-msgstr ""
+msgstr "Ese reporte es duplicado. Por favor, actualizar el reporte original:"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
@@ -3794,7 +4060,7 @@ msgid "Tips for perfect photos"
 msgstr "Tips para fotos perfectas"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3825,8 +4091,26 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr "Total señalado"
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "marcado como arreglado"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr "Total sin señalización"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr "Total de reporte recibidos"
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr "¿Se necesita administración del tráfico?"
 
@@ -3834,7 +4118,7 @@ msgstr "¿Se necesita administración del tráfico?"
 msgid "Trusted by bodies:"
 msgstr "Confiables por los organismos administrativos:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Acreditado para hacer informes que no requieren inspección"
 
@@ -3859,7 +4143,8 @@ msgstr "Pruebe enviándonos un correo directamente:"
 msgid "Unconfirmed"
 msgstr "Sin confirmar"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "Informes sin arreglar"
 
@@ -3883,6 +4168,11 @@ msgstr "Error desconocido"
 msgid "Unknown problem ID"
 msgstr "ID de problema desconocido"
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Entre los pre-seleccionados"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3939,10 +4229,10 @@ msgstr "Actualización de estados"
 msgid "Updated"
 msgstr "Actualizado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3986,26 +4276,32 @@ msgstr "Mapa usado"
 msgid "User ID to attribute fetched comments to"
 msgstr "ID de usuario a quien atribuir los comentarios obtenidos"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Eliminada marca de usuario"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Usuario marcado"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "marcado como arreglado"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-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. "
 
@@ -4036,6 +4332,15 @@ msgstr "Visualizando una ubicación"
 msgid "Viewing a problem"
 msgstr "Visualizando un problema"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr "La semana pasada"
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Barrios de este ayuntamiento"
@@ -4055,7 +4360,7 @@ msgstr "Hemos encontrado más de una coincidencia para el problema de referencia
 msgid "We need your email address, please give it below."
 msgstr "Necesitamos su dirección de email, por favor escríbala debajo."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Somos conscientes de este problema podría ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos."
 
@@ -4072,6 +4377,10 @@ msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Lamentamos que el problema no esté arreglado. ¿Por qué no prueba a escribir directamente a sus representantes locales?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr "La semana pasada"
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!"
@@ -4089,11 +4398,11 @@ msgstr "Una vez editada"
 msgid "When sent"
 msgstr "Una vez enviada"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
-msgstr ""
+msgstr "¿Ese reporte es un reporte duplicado de qué reporte?"
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "¡Espere! Tres fotos son suficientes."
 
@@ -4128,10 +4437,16 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac
 msgid "Wrong location? Just click again on the map."
 msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr "El año pasado"
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Año"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4160,6 +4475,10 @@ msgstr "Sí, tengo una contraseña"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:"
 
+#: templates/web/base/js/translation_strings.html:70
+msgid "You are offline"
+msgstr "Está sin conexion"
+
 #: 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 "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o  similar:"
@@ -4206,6 +4525,10 @@ msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activ
 msgid "You declined; please fill in the box above"
 msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4267,7 +4590,7 @@ msgid "Your Reports"
 msgstr "Sus notificaciones"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Su cuenta"
 
@@ -4304,6 +4627,11 @@ msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/priv
 msgid "Your name"
 msgstr "Su nombre"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Sus notificaciones"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4333,6 +4661,10 @@ msgstr "Sus notificaciones"
 msgid "Your shortlist"
 msgstr "Sus pre-seleccionados"
 
+#: templates/web/base/js/translation_strings.html:63
+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."
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Sus actualizaciones"
@@ -4343,7 +4675,7 @@ msgid "Yourself"
 msgstr "Usted mismo"
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "todo"
 
@@ -4351,7 +4683,7 @@ msgstr "todo"
 msgid "by %s"
 msgstr "por %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "marcado como un informe duplicado"
 
@@ -4379,49 +4711,49 @@ msgstr "editar usuario"
 msgid "from %s different users"
 msgstr "de %s usuarios diferentes"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultima actualización %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "menos de un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "marcado como acción programada"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "marcado como una referencia interna"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "marcado como cerrado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "marcado como arreglado"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "marcado como en progreso"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "marcado como en investigación"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "marcado como que no se puede arreglar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "marcado como que el ayuntamiento no es responsable"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "marcado como planificado"
 
@@ -4432,7 +4764,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr "nada"
 
@@ -4467,8 +4799,8 @@ msgstr "consignados inicialmente:"
 msgid "other areas:"
 msgstr "otras áreas:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "reabierto"
 
@@ -4489,7 +4821,7 @@ msgstr "ayuntamiento"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "no hay marcador porque el usuario no usó el mapa"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "este tipo de problema local"
 
@@ -4497,6 +4829,16 @@ msgstr "este tipo de problema local"
 msgid "today"
 msgstr "hoy"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Actualizar"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Actualizaciones"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "mapa utilizado"
@@ -4514,27 +4856,41 @@ msgstr "El usuario es el propietario del problema"
 msgid "ward"
 msgstr "barrio"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "Dirección de email"
+msgstr[1] "Dirección de email"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4542,13 +4898,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d simpatizante"
 msgstr[1] "%d simpatizantes"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d año"
+msgstr[1] "%d años"
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4577,6 +4940,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> notificaciones actualizadas"
 msgstr[1] "<big>%s</big> notificaciones actualizadas"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Notificado por %s en %s"
+msgstr[1] "Notificado por %s en %s"
+
 #: 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."
@@ -4591,5 +4961,49 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
 msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área."
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "ultima actualización %s"
+msgstr[1] "ultima actualización %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Notificar"
+msgstr[1] "Notificar"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Todas las categorías"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "ID externo"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "Inspección requerida"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Editar la categoría del informe"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Notificado por %s en %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "ultima actualización %s"
+
+#~ msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
+#~ msgstr "Los informes de usuarios con una reputación suficientemente alta serán enviados inmediatamente sin requerir inspección.  Cada umbral de categoría puede ser administrado en su página de edición.  Los usuarios ganan reputación cuando un reporte que hayan hecho sea marcado como inspeccionado por los inspectores."
+
+#~ msgid "Reputation:"
+#~ msgstr "Reputación:"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index f45867ab4..7f25b66fe 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>, 2016\n"
 "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " et "
 
@@ -112,11 +112,11 @@ msgstr ""
 " Par exemple, un rapport graffiti sera envoyé à l'administration\n"
 " de district, et apparaîtrait dans les deux administrations."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "Localité %s, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, dans la localité %s"
 
@@ -164,7 +164,7 @@ msgstr "(résolu)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(non signalé à l&rsquo;administration)"
 
@@ -172,17 +172,17 @@ msgstr "(non signalé à l&rsquo;administration)"
 msgid "(optional)"
 msgstr "(facultatif)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(envoyé aux deux)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Choisissez une catégorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Choisissez un type de propriété --"
 
@@ -194,6 +194,14 @@ msgstr "--Choisissez un modèle--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr "Nid de poule de 10cm près de la boîte postale"
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -205,12 +213,20 @@ msgstr ""
 "             Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).<br>\n"
 "              Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Afficher</label> %s <label for=\"filter_categories\">à propos de</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -229,11 +245,11 @@ msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong> Remarque: </strong> Ce rapport a été envoyé pour action. Toutes les modifications apportées ne seront pas transmises."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong> Remarque: </strong> Ce rapport n'a pas encore été envoyé pour action. Toutes les modifications apportées ne peuvent pas être transmises."
 
@@ -245,6 +261,8 @@ msgstr "<strong>Oui</strong>, j'ai un mot de passe :"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -290,15 +308,15 @@ msgstr "Ajouter à la liste"
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Ajouter/modifier des catégories de problèmes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Ajouter/modifier les priorités de réponse"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Ajouter/modifier des modèles de réponse"
 
@@ -310,6 +328,10 @@ msgstr "Ajouté %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s."
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Encore une fois :"
@@ -326,6 +348,13 @@ msgstr "Alerte %d désactivée (création %s)"
 msgid "Alert me to future updates"
 msgstr "M'alerter de futures mises à jour"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "Tous"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -335,12 +364,14 @@ msgstr "Tous les rapports"
 msgid "All Reports as CSV"
 msgstr "Tous les rapports au format CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Toutes catégories"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -375,11 +406,12 @@ msgstr "un autre utilisateur"
 msgid "Are you a developer?"
 msgstr "Vous êtes un développeur ?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Êtes-vous sûr de vouloir annuler cet envoi ?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr ?"
@@ -416,7 +448,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:"
 msgid "Assign to subdivision:"
 msgstr "Affecté à la subdivision:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr "Affecter des utilisateurs aux zones"
 
@@ -442,15 +474,23 @@ msgid "Auto-response:"
 msgstr "Réponse automatique:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Catégories disponibles"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Évitez les renseignements personnels et les plaques d'immatriculation"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "En attente de modération"
@@ -468,7 +508,7 @@ msgid "Ban email address"
 msgstr "Bannir l'adresse mail"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -477,7 +517,7 @@ msgid "Bodies"
 msgstr "Interlocuteurs"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -505,14 +545,15 @@ msgid "Categories"
 msgstr "Catégories"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Catégories:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -523,7 +564,7 @@ msgstr "Catégories:"
 msgid "Category"
 msgstr "Catégorie"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Changement de catégorie de ‘%s’ à ‘%s’"
 
@@ -533,6 +574,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Taux de résolution pour les problèmes > 4 semaines"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -540,7 +582,7 @@ msgstr "Taux de résolution pour les problèmes > 4 semaines"
 msgid "Category:"
 msgstr "Catégorie :"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Catégorie : %s"
 
@@ -609,10 +651,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -643,10 +689,12 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -654,11 +702,11 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec
 msgid "Closed"
 msgstr "Clos"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Clos par l'administration"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "rapports fermés"
 
@@ -684,6 +732,11 @@ msgstr "Données de collaboration :"
 msgid "Cobrand:"
 msgstr "Collaboration :"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Carte utilisée"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -747,8 +800,8 @@ msgstr "Contacter l'équipe"
 msgid "Coordinates:"
 msgstr "Coordonnées:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Impossible de trouver l'utilisateur"
 
@@ -766,6 +819,36 @@ msgstr "Administration"
 msgid "Council contacts for %s"
 msgstr "Contacts de l'administration pour %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "marqué comme terminé"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "marqué(s) comme réglé(s)"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "marqué comme en cours"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "marqué comme en cours d'investigation"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "marqué comme planifié"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Ref. de la mairie :&nbsp;%s"
@@ -790,15 +873,15 @@ msgstr "Créer un rapport"
 msgid "Create category"
 msgstr "Créer une catégorie"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "Créer une priorité"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr "Créer des rapports/mises à jour de l'administration"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur"
 
@@ -842,7 +925,11 @@ msgstr "Tableau de bord"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Traité par la subdivision dans les 5 jours ouvrables"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -856,6 +943,11 @@ msgstr "Supprimer le modèle"
 msgid "Deleted"
 msgstr "Effacé"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -892,6 +984,12 @@ msgstr "Ne pas utiliser la carte"
 msgid "Diligency prize league table"
 msgstr "Tableau d'honneur de la réactivité"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Enregistrer les modifications"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "Ne pas envoyer d'alertes par email concernant les commentaires sur le problème au créateur"
@@ -917,23 +1015,25 @@ msgstr "Vous n'aimez pas les formulaires ?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Glissez et déposez les photos ici ou <u> cliquer pour les envoyer </ u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dupliqué"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Dupliqué"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Dupliqué"
@@ -949,8 +1049,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr "Abscisse/Ordonnée :"
 
@@ -964,28 +1064,28 @@ msgid "Edit"
 msgstr "Éditer"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Editer les détails de l'intelocuteur"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "Modifier les détails des autres utilisateurs"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "Modifier les autorisations des autres utilisateurs"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "Éditer la catégorie des rapports"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "Éditer la priorité des rapports"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "Éditer les rapports"
 
@@ -1024,7 +1124,7 @@ msgstr "Éditeur"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email rajouté à la liste des abus"
 
@@ -1042,7 +1142,7 @@ msgstr "Alerte E-mail créé"
 msgid "Email alert deleted"
 msgstr "Alerte E-mail supprimé"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Email déjà présent dans la liste des abus"
 
@@ -1093,7 +1193,7 @@ msgstr "destinataire"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Saisir un nom de rue Z&uuml;complet"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 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é"
 
@@ -1127,8 +1227,8 @@ msgstr "Saisissez les détails du problème"
 msgid "Error"
 msgstr "Erreur"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Tout"
 
@@ -1142,14 +1242,23 @@ msgid "Examples:"
 msgstr "Exemples :"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "Catégorie existante"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Expliquez le problème"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Tous les rapports au format CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1158,6 +1267,7 @@ msgid "Extern"
 msgstr "Externe"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "ID externe"
 
@@ -1178,8 +1288,8 @@ msgstr "Équipe externe"
 msgid "Extra data:"
 msgstr "Donnée supplémentaire:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "Précisions supplémentaires"
 
@@ -1204,10 +1314,12 @@ msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1215,6 +1327,8 @@ msgstr "Résolu"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Résolu - Administration"
 
@@ -1223,7 +1337,7 @@ msgstr "Résolu - Administration"
 msgid "Fixed - User"
 msgstr "Résolu - Usager"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "rapports résolus"
 
@@ -1232,7 +1346,7 @@ msgid "Fixed:"
 msgstr "Résolu :"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Signaler comme supprimé"
@@ -1318,11 +1432,13 @@ msgstr "Donnez-moi un flux RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Heureux d'entendre qu'il a été résolu!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Ok"
@@ -1331,11 +1447,11 @@ msgstr "Ok"
 msgid "Going to send questionnaire?"
 msgstr "Envoi du questionnaire ?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "Accorder l'accès à l'admin"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graphique historique des problèmes créés, par statut"
 
@@ -1351,7 +1467,7 @@ msgstr "Est-ce que le problème a été réglé ?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Est-ce que vous aviez déjà signalé un problème à une administration, ou est-ce que c'est votre première fois ?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1376,6 +1492,9 @@ msgstr "Bienvenue %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1383,6 +1502,11 @@ msgstr "Bienvenue %s"
 msgid "Hidden"
 msgstr "Caché(s)"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Renvoyer le rapport"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Cacher les anciens"
@@ -1391,6 +1515,10 @@ msgstr "Cacher les anciens"
 msgid "Hide pins"
 msgstr "Cacher les épingles"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historique"
@@ -1422,7 +1550,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1440,6 +1568,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr "Identifier un <strong>parent</strong> si cet interlocuteur fait lui-même partie d'un autre intelocuteur. Pour des installations basiques, vous n'avez pas besoin de joindre des interlocuteurs de cette manière."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1450,7 +1582,7 @@ msgstr "Si deux interlocuteurs ou plus servent le même lieu, FixMyStreet combin
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Si vous obtenez un peu plus d'informations sur l'état de votre problème, s'il vous plaît revenez sur le site et effectuez une mise à jour."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 "Si vous voulez que seulement cette priorité soit une option pour des catégories spécifiques, choisissez-les ici. Par défaut, elles seront visibles pour toutes les catégories."
 
@@ -1517,8 +1649,8 @@ msgstr "ID invalide"
 msgid "Illegal feed selection"
 msgstr "Sélection de flux invalide"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1536,7 +1668,9 @@ msgstr "En plus, les attributs suivants qui ne font pas partie de la spécificat
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1554,7 +1688,7 @@ msgstr "Inclure les détails personnels du reporter"
 msgid "Include unconfirmed reports"
 msgstr "Inclure les rapports non confirmés"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Valeur has_photo invalide \"%s\""
 
@@ -1562,7 +1696,7 @@ msgstr "Valeur has_photo invalide \"%s\""
 msgid "Inspection required"
 msgstr "inspection requise"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "Instruire entrepreneurs pour résoudre les problèmes"
 
@@ -1572,33 +1706,41 @@ msgstr "Notes internes"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Référence interne"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Valeur agency_responsible invalide \"%s\""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Date de fin invalide"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Format spécifié %s invalide"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Date de début invalide"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1629,6 +1771,15 @@ msgstr "Zone d'administration Inconnue"
 msgid "Keep me signed in on this computer"
 msgstr "Se souvenir de moi sur cet ordinateur"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Dernière actualisation :"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1642,11 +1793,12 @@ msgstr "Dernière actualisation :"
 msgid "Last&nbsp;update:"
 msgstr "Dernière&nbsp;actualisation :"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr "Moins récemment mis à jour"
 
@@ -1654,6 +1806,10 @@ msgstr "Moins récemment mis à jour"
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Laisser ce champ vide si tous les rapports pour cet interlocuteur doivent être envoyés en utilisant la même méthode (cead, \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Lister tous les problèmes rapportés"
@@ -1675,7 +1831,8 @@ msgstr "Flux RSS et alertes email locaux"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Flux RSS et alertes email locales pour « %s »"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Alertes locales"
 
@@ -1683,15 +1840,36 @@ msgstr "Alertes locales"
 msgid "Locate the problem on a map of the area"
 msgstr "Localisez le problème sur un plan des alentours"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "CARTE"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr "Gérer la liste"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1715,7 +1893,7 @@ msgstr "Marqué fixé / fermé depuis les huit dernières semaines"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Marqué fixé / fermé depuis plus de huit semaines"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr "Marquer les détails du problème"
 
@@ -1735,7 +1913,7 @@ msgstr "Message à l'organisme externe compétent:"
 msgid "Missing bodies:"
 msgstr "Organismes disparus :"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "jurisdiction_id manquant"
 
@@ -1743,7 +1921,7 @@ msgstr "jurisdiction_id manquant"
 msgid "Moderate"
 msgstr "Modérer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr "Modérer les détails du rapport"
 
@@ -1751,15 +1929,32 @@ msgstr "Modérer les détails du rapport"
 msgid "Moderate this report"
 msgstr "Modérer ce rapport"
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Modérer ce rapport"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Signalé par %s à %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Modéré par division dans le délai d'un jour ouvrable"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "Modérer ce rapport"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mois"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "Les plus commentés"
 
@@ -1767,7 +1962,7 @@ msgstr "Les plus commentés"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1795,7 +1990,7 @@ msgstr "Nom :"
 msgid "Name: %s"
 msgstr "Nom: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr "Accédez à ce problème"
 
@@ -1804,7 +1999,7 @@ msgstr "Accédez à ce problème"
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1813,7 +2008,7 @@ msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré a
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1897,7 +2092,7 @@ msgstr "Nouvel état"
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "Plus récents"
 
@@ -1905,6 +2100,7 @@ msgstr "Plus récents"
 msgid "Next"
 msgstr "Suivant"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1933,7 +2129,7 @@ msgstr "Aucun intelocuteur"
 msgid "No council"
 msgstr "Pas d'administration"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Aucune administration sélectionnée"
 
@@ -1951,6 +2147,8 @@ msgstr "Aucun utilisateur coché trouvé."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1961,6 +2159,14 @@ msgstr "Ne peut être résolu"
 msgid "No further updates"
 msgstr "Pas d'autres mises à jour"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Aucun résultat retourné"
@@ -2009,6 +2215,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2070,6 +2278,14 @@ msgstr "Maintenant pour envoyer votre mise à jour&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Probèmes<br /> anciens / inconnus"
@@ -2086,7 +2302,7 @@ msgstr "Anciens <br />résolus"
 msgid "Older <br>problems"
 msgstr "Anciens <br />problèmes"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "Plus anciens"
 
@@ -2096,7 +2312,10 @@ msgstr "Plus anciens"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2140,15 +2359,15 @@ msgstr "Ou problèmes signalés à :"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Autres"
 
@@ -2183,11 +2402,11 @@ msgstr "Mot de passe (facultatif)"
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Lien permanent"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "Autorisations :"
 
@@ -2254,8 +2473,8 @@ msgstr "Placer l'épingle sur la carte"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2281,14 +2500,14 @@ msgid "Please check your email address is correct"
 msgstr "Merci de vérifier que votre adresse email est correcte"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Merci de sélectionner une catégorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Merci de choisir un type de propriété"
 
@@ -2317,8 +2536,8 @@ msgstr "Merci de ne pas être injurieux&nbsp;&mdash; Calomnier l'administration
 msgid "Please enter a message"
 msgstr "Merci d'entrer un message"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Merci d'entrer un nom"
 
@@ -2333,13 +2552,13 @@ msgid "Please enter a password"
 msgstr "Merci d'entrer un mot de passe :"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Merci d'enter un sujet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2352,7 +2571,7 @@ msgstr "Merci d'entrer un email valide"
 msgid "Please enter a valid email address"
 msgstr "Merci d'entrer une adresse email valide"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Merci d'entrer quelques détails"
@@ -2379,14 +2598,14 @@ msgstr "Merci d'entrer votre adresse email"
 msgid "Please enter your first name"
 msgstr "Saisissez votre prénom"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2449,7 +2668,7 @@ 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:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr "Veuillez fournir une mise à jour publique de ce rapport."
 
@@ -2482,10 +2701,10 @@ msgstr "Merci de sélectionner le type d'alerte que vous voulez"
 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."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Veuillez uniquement envoyer une image"
 
@@ -2508,15 +2727,15 @@ msgstr "Envoyer"
 msgid "Posted anonymously at %s"
 msgstr "Signalé anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Signalé par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Envoyé par <strong>%s</strong> (%s) à %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Envoyé par <strong>%s</strong> à %s"
 
@@ -2532,12 +2751,12 @@ msgstr "Précédent"
 msgid "Priorities"
 msgstr "Priorités"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "Priorité"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Confidentialité"
 
@@ -2580,7 +2799,7 @@ msgstr "Problème %d signalé à l&rsquo;administration %s"
 msgid "Problem breakdown by state"
 msgstr "Répartition des problèmes par état"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problème signalé comme ouvert."
 
@@ -2588,7 +2807,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problèmes"
@@ -2609,13 +2828,13 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problèmes à moins de %.1fkm de ce lieu"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problèmes à l'intérieur de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problèmes dans la localité %s"
 
@@ -2661,7 +2880,7 @@ msgstr "Mise à jour publique :"
 msgid "Public response:"
 msgstr "Réponse publique:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr "Mise à jour publique :"
 
@@ -2697,11 +2916,11 @@ msgstr "Questionnaire rempli par le requérant"
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Flux RSS pour %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Flux RSS pour la localité %s, %s"
 
@@ -2709,11 +2928,11 @@ msgstr "Flux RSS pour la localité %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Flux RSS de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Flux RSS de %s, dans la localité %s"
 
@@ -2721,13 +2940,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Flux RSS des problèmes à l'intérieur de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Flux RSS de problèmes à l'intérieur de la localité %s"
 
@@ -2746,7 +2965,7 @@ msgstr "Flux RSS des mises à jour pour ce problème"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr "Reçu par %s un peu plus tard"
 
@@ -2764,7 +2983,7 @@ msgstr "Récemment<br />résolus"
 msgid "Recently reported problems"
 msgstr "Problèmes signalés récemment"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr "Récemment mis à jour"
 
@@ -2803,12 +3022,12 @@ msgid "Report"
 msgstr "Rapport"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "Rapport ID :"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Signaler un problème"
@@ -2826,6 +3045,11 @@ msgstr "Signaler comme"
 msgid "Report on %s"
 msgstr "Signaler sur %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Signaler comme"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2837,7 +3061,7 @@ msgstr "Signaler votre problème"
 msgid "Report, view, or discuss local problems"
 msgstr "Signalez et suivez les problèmes locaux"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Signalé anonymement à %s"
@@ -2847,7 +3071,7 @@ msgstr "Signalé anonymement à %s"
 msgid "Reported before"
 msgstr "Signalé avant"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Signalé par %s à %s"
@@ -2861,27 +3085,27 @@ msgstr "Rapporté par:"
 msgid "Reported in the %s category"
 msgstr "Rapporté dans la catégorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Signalé dans la catégorie %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Signalé par %s anonymement à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Signalé par %s par %s à %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Signalé par %s dans la catégorie %s par %s"
 
@@ -2905,11 +3129,12 @@ msgstr "Signalisation d'un problème"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Rapports"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte"
 
@@ -2917,10 +3142,6 @@ msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourci
 msgid "Reports awaiting approval"
 msgstr "Rapports attendant une validation"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr "les rapports des utilisateurs ayant une réputation élevée seront envoyés immédiatement sans exiger l'inspection. le seuil de chaque catégorie peut être géré sur sa page d'édition. Les utilisateurs gagnent en réputation quand un rapport qu'ils ont fait est marqué comme inspectés par les inspecteurs."
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr "Les déclarations faites par les utilisateurs de confiance seront envoyés à l'organisme responsable sans être inspecté en premier."
@@ -2929,7 +3150,12 @@ msgstr "Les déclarations faites par les utilisateurs de confiance seront envoy
 msgid "Reports published"
 msgstr "Rapports publiés"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Signaler un problème"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr "Rapports en attente d'être envoyés"
 
@@ -2941,10 +3167,6 @@ msgstr "Les rapports seront automatiquement envoyés sans avoir besoin d'être i
 msgid "Reputation threshold"
 msgstr "Seuil de réputation"
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr "Réputation :"
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Renvoyer le rapport"
@@ -2976,6 +3198,18 @@ msgstr "Modèles de réponse"
 msgid "Response Templates for %s"
 msgstr "Modèles de réponse pour %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2991,15 +3225,15 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Pivoter à gauche"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3011,36 +3245,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satellite"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "rapport marqué comme dupliqué"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr "Sauvegardez avec une mise à jour publique"
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Rechercher rapports"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Rechercher les utilisateurs"
 
@@ -3067,7 +3309,7 @@ msgstr "Aucun utilisateur trouvé lors de la recherche."
 msgid "See our privacy policy"
 msgstr "Voir notre politique de confidentialité"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 #, fuzzy
 msgid "See user detail for reports created as the council"
 msgstr "Créer des rapports/mises à jour de l'administration"
@@ -3102,7 +3344,7 @@ msgstr "Envoyer un statuts Open311 étendus avec des mises à jour de demande de
 msgid "Sent report back"
 msgstr "Envoyé le rapport en retour"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Envoyé à %s %s plus tard)"
 
@@ -3115,7 +3357,7 @@ msgstr "Envoyé :"
 msgid "Service:"
 msgstr "Service:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr "Situé à mon emplacement actuel"
 
@@ -3123,6 +3365,7 @@ msgstr "Situé à mon emplacement actuel"
 msgid "Share"
 msgstr "Partagez"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3132,6 +3375,7 @@ msgstr "Liste"
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr "Shortlisté"
 
@@ -3139,23 +3383,43 @@ msgstr "Shortlisté"
 msgid "Shortlisted by %s"
 msgstr "Shortlisté par %s"
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Montrer les anciens"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Afficher mon nom publiquement"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Afficher mon nom publiquement"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Montrer les anciens"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Montrer les anciens"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Montrer les épingles"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3197,7 +3461,7 @@ msgstr "Photos de rapports récents"
 msgid "Some text to localize"
 msgstr "Du texte pour localiser"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3228,15 +3492,21 @@ msgstr "Désolé, nous ne pouvons pas vous connecter pour le moment. Veuillez co
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr "Désolé, vous n'êtes pas autorisé à faire cette action."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr "Trier par"
 
@@ -3254,12 +3524,12 @@ msgstr "Date de début:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "État actuel"
@@ -3275,7 +3545,7 @@ msgstr "État actuel :"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3296,7 +3566,7 @@ msgstr "Encore ouvert, via le questionnaire, %s"
 msgid "Street View"
 msgstr "Street View"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Sous-catégorie: %s"
 
@@ -3324,7 +3594,7 @@ msgstr "Envoyer"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3381,11 +3651,11 @@ msgstr "Résumé"
 msgid "Summary reports"
 msgstr "Rapports résumés"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr "Superuser :"
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 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."
 
@@ -3448,7 +3718,7 @@ msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de local
 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 "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 ?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), réessayez s'il vous plaît."
 
@@ -3462,7 +3732,7 @@ msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à n
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Ce code postal n'a pas été reconnu, désolé."
 
@@ -3630,7 +3900,7 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3712,18 +3982,18 @@ msgstr ""
 "Cet intelocuteur recevra seulement des rapports pour des problèmes qui sont situés sur sa <strong>zone couverte</strong>.\n"
 "Un interlocuteur ne recevra aucun rapport tant qu'il ne couvre aucune zone."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Cet email a été envoyé aux deux administrations couvrant l'emplacement du problème parce que l'utilisateur ne l'a pas classé ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question, ou faites-nous savoir la bonne catégorie de problèmes afin que nous puissions l'ajouter à notre système."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Ces renseignements sont nécessaires"
 
@@ -3739,14 +4009,19 @@ msgstr "Ceci est un résumé de tous les rapports pour ce site."
 msgid "This pothole has been here for two months and…"
 msgstr "Ce nid de poule est ici depuis deux mois et ..."
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Ce problème a été résolu"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Ce problème n'a pas été résolu"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Ce problème n'a pas été résolu"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3794,7 +4069,7 @@ msgid "Tips for perfect photos"
 msgstr "Conseils pour des photos adaptées"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3825,8 +4100,26 @@ msgstr "Pour voir une carte de l'emplacement précis de ce problème"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "marqué(s) comme réglé(s)"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr "La gestion du trafic est nécessaire ?"
 
@@ -3834,7 +4127,7 @@ msgstr "La gestion du trafic est nécessaire ?"
 msgid "Trusted by bodies:"
 msgstr "Accrédité par les organismes:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Accrédité pour faire des rapports sans être inspectés"
 
@@ -3859,7 +4152,8 @@ msgstr "Essayez en nous envoyant un e-mail directement:"
 msgid "Unconfirmed"
 msgstr "Non confirmé"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "rapports non résolus"
 
@@ -3883,6 +4177,11 @@ msgstr "erreur inconnue"
 msgid "Unknown problem ID"
 msgstr "ID de problème inconnu"
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Shortlisté"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3939,10 +4238,10 @@ msgstr "Mettre à jour les statuts"
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3986,26 +4285,32 @@ msgstr "Carte utilisée"
 msgid "User ID to attribute fetched comments to"
 msgstr "ID utilisateur de récupération des commentaires à"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Utilisateur dé–signalé"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Utilisateur signalé"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "marqué(s) comme réglé(s)"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "La recherche utilisateurs parcourt les noms et adresses courriel."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-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."
 
@@ -4036,6 +4341,15 @@ msgstr "Consultation d'un lieu"
 msgid "Viewing a problem"
 msgstr "Consultation d'un problème"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Localités de cette administration"
@@ -4055,7 +4369,7 @@ msgstr "Nous avons trouvé plus d'une correspondance pour cette référence de p
 msgid "We need your email address, please give it below."
 msgstr "Nous avons besoin de votre adresse e-mail, veuillez l'indiquer ci-dessous."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Nous sommes conscients que ce problème pourrait être la responsabilité de %s, mais nous n'avons actuellement pas leurs coordonnées. Si vous connaissez une adresse de contact approprié, faites-le nous savoir s'il vous plaît."
 
@@ -4072,6 +4386,10 @@ msgstr "Nous utiliserons vos informations personnelles en accord avec notre  <a
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Nous sommes désolés d&rsquo;apprendre que le problème n&esquo;est pas résolu. Pourquoi ne pas essayer d'écrire directement à vos élus locaux ?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Nous reviendrons vers vous dès que nous le pouvons."
@@ -4089,11 +4407,11 @@ msgstr "Édité le"
 msgid "When sent"
 msgstr "Envoyé le"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Trois photos suffisent."
 
@@ -4128,10 +4446,16 @@ msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctu
 msgid "Wrong location? Just click again on the map."
 msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Année"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4160,6 +4484,10 @@ msgstr "Oui j'ai un mot de passe"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Vous ne comprenez pas les raisons pour lesquelles ce rapport a été inutilement retiré:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou similaires :"
@@ -4206,6 +4534,10 @@ msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez p
 msgid "You declined; please fill in the box above"
 msgstr "Vous avez refusé; merci de remplir le champ ci-dessus"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4264,7 +4596,7 @@ msgid "Your Reports"
 msgstr "Vos rapports"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Votre compte"
 
@@ -4301,6 +4633,11 @@ msgstr "Votre information sera utilisée seulement en accord avec notre <a href=
 msgid "Your name"
 msgstr "Votre nom"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Vos rapports"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4330,6 +4667,10 @@ msgstr "Vos rapports"
 msgid "Your shortlist"
 msgstr "Votre liste"
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Vos mises à jour"
@@ -4340,7 +4681,7 @@ msgid "Yourself"
 msgstr "Vous"
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "Tous"
 
@@ -4348,7 +4689,7 @@ msgstr "Tous"
 msgid "by %s"
 msgstr "par %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "rapport marqué comme dupliqué"
 
@@ -4376,49 +4717,49 @@ msgstr "saisissez l'utilisateur"
 msgid "from %s different users"
 msgstr "de %s utilisateurs différents"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "dernière mise à jour %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "moins d'une minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "action marquée comme établie"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "marqué comme une référence interne"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "marqué comme terminé"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "marqué(s) comme réglé(s)"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "marqué comme en cours"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "marqué comme en cours d'investigation"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "marqué comme impossible à résoudre"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "marqué comme n'étant pas de la responsabilité de la commune"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "marqué comme planifié"
 
@@ -4429,7 +4770,7 @@ msgid "n/a"
 msgstr "s.o."
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr "aucun"
 
@@ -4464,8 +4805,8 @@ msgstr "saisi initialement: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "autres lieux:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "réouvert"
 
@@ -4486,7 +4827,7 @@ msgstr "L'administration locale"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "Il n'y a aucune épingle affichée parce que l'utilisateur n'a pas utilisé la carte"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "Ce type de problème local"
 
@@ -4494,6 +4835,16 @@ msgstr "Ce type de problème local"
 msgid "today"
 msgstr "aujourd'hui"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Mise à jour"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Mises à jour"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "plan utilisé"
@@ -4511,27 +4862,41 @@ msgstr "L'utilisateur est propriétaire du problème"
 msgid "ward"
 msgstr "localité"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "Adresse e-mail"
+msgstr[1] "Adresse e-mail"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4539,13 +4904,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d supporter"
 msgstr[1] "%d supporters"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4574,6 +4946,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> mise à jour de rapport"
 msgstr[1] "<big>%s</big> mises à jour de rapports"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Signalé par %s à %s"
+msgstr[1] "Signalé par %s à %s"
+
 #: 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."
@@ -4588,5 +4967,49 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu."
 msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu."
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "dernière mise à jour %s"
+msgstr[1] "dernière mise à jour %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Rapport"
+msgstr[1] "Rapport"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Toutes catégories"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "ID externe"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "inspection requise"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Éditer la catégorie des rapports"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Signalé par %s à %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "dernière mise à jour %s"
+
+#~ msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
+#~ msgstr "les rapports des utilisateurs ayant une réputation élevée seront envoyés immédiatement sans exiger l'inspection. le seuil de chaque catégorie peut être géré sur sa page d'édition. Les utilisateurs gagnent en réputation quand un rapport qu'ils ont fait est marqué comme inspectés par les inspecteurs."
+
+#~ msgid "Reputation:"
+#~ msgstr "Réputation :"
+
 #~ msgid "Cancel"
 #~ msgstr "Annuler"
diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
index bfdb98370..7a7c0a274 100644
--- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/he_IL.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr ""
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr ""
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr ""
 
@@ -162,17 +162,17 @@ msgstr ""
 msgid "(optional)"
 msgstr ""
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr ""
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr ""
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr ""
@@ -310,6 +332,12 @@ msgstr ""
 msgid "Alert me to future updates"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr ""
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "קטגוריה"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "קטגוריה: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,10 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +768,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr ""
 
@@ -736,6 +787,31 @@ msgstr "עירייה"
 msgid "Council contacts for %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+msgid "Council has marked as closed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+msgid "Council has marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +836,15 @@ msgstr "צור דו\"ח"
 msgid "Create category"
 msgstr "צור קטגוריה"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +888,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +906,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "נמחק"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +947,11 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+msgid "Discard changes"
+msgstr ""
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +977,25 @@ msgstr "לא אוהב טפסים?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "כפול"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "כפול"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "כפול"
@@ -916,8 +1008,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1023,28 @@ msgid "Edit"
 msgstr "ערוך"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "ערוך פרטי גוף"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1083,7 @@ msgstr "עורך"
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה"
 
@@ -1009,7 +1101,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה"
 
@@ -1054,7 +1146,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1088,8 +1180,8 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1103,14 +1195,22 @@ msgid "Examples:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1219,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1240,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1266,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1279,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -1184,7 +1289,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1193,7 +1298,7 @@ msgid "Fixed:"
 msgstr ""
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1279,11 +1384,13 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1292,11 +1399,11 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1312,7 +1419,7 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1444,9 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1454,11 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "צור דו\"ח"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr ""
@@ -1352,6 +1467,10 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr ""
@@ -1383,7 +1502,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1520,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1534,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1592,8 @@ msgstr ""
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1611,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1631,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1639,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1649,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1714,14 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+msgid "Last 7 days"
+msgstr ""
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1735,12 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1748,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr ""
@@ -1627,7 +1773,8 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr ""
 
@@ -1635,15 +1782,36 @@ msgstr ""
 msgid "Locate the problem on a map of the area"
 msgstr ""
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1835,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1855,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1695,7 +1863,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1871,29 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+msgid "Moderate this update"
+msgstr ""
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+msgid "Moderated by %s at %s"
+msgstr ""
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1901,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1929,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1938,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1947,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2029,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2037,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2066,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr ""
 
@@ -1901,6 +2084,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2096,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1951,6 +2144,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2207,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -2028,7 +2231,7 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2241,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2288,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr ""
 
@@ -2125,11 +2331,11 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2402,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2429,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2256,8 +2462,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2478,13 @@ msgid "Please enter a password"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2497,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
@@ -2318,14 +2524,14 @@ msgstr ""
 msgid "Please enter your first name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2594,7 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2627,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2653,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2471,12 +2677,12 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2519,7 +2725,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2527,7 +2733,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -2548,13 +2754,13 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2599,7 +2805,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2635,11 +2841,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -2647,11 +2853,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2659,13 +2865,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2684,7 +2890,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2702,7 +2908,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2741,12 +2947,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
@@ -2764,6 +2970,10 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+msgid "Report state:"
+msgstr ""
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2775,7 +2985,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2785,7 +2995,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2799,27 +3009,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2843,11 +3053,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2855,10 +3066,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2867,7 +3074,11 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+msgid "Reports saved offline."
+msgstr ""
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2879,10 +3090,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2914,6 +3121,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2929,15 +3148,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2949,35 +3168,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3004,7 +3231,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3038,7 +3265,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3051,7 +3278,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3059,6 +3286,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3068,6 +3296,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3075,23 +3304,40 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+msgid "Show Photo?"
+msgstr ""
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+msgid "Show photo"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3131,7 +3377,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3162,15 +3408,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3188,12 +3440,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
@@ -3209,7 +3461,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3230,7 +3482,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3258,7 +3510,7 @@ msgstr ""
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3315,11 +3567,11 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3382,7 +3634,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3396,7 +3648,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3552,7 +3804,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3626,18 +3878,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3653,14 +3905,18 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/update/form_update.html:54
+msgid "This problem is still ongoing"
+msgstr ""
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3708,7 +3964,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3739,8 +3995,25 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+msgid "Total marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3748,7 +4021,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3773,7 +4046,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3797,6 +4071,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3853,10 +4131,10 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3900,26 +4178,31 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+msgid "User has marked as fixed"
+msgstr ""
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3950,6 +4233,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3969,7 +4261,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3986,6 +4278,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4003,11 +4299,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4042,10 +4338,16 @@ msgstr ""
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4074,6 +4376,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4117,6 +4423,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4175,7 +4485,7 @@ msgid "Your Reports"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4212,6 +4522,10 @@ msgstr ""
 msgid "Your name"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:62
+msgid "Your offline reports"
+msgstr ""
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4241,6 +4555,10 @@ msgstr ""
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -4251,7 +4569,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4259,7 +4577,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4287,49 +4605,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4340,7 +4658,7 @@ msgid "n/a"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4375,8 +4693,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -4397,7 +4715,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4405,6 +4723,15 @@ msgstr ""
 msgid "today"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:73
+msgid "update"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "כפול"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4422,27 +4749,41 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:246
+#, 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"
@@ -4450,13 +4791,20 @@ msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4485,6 +4833,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/base/report/_item.html:49
+#, 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."
@@ -4498,3 +4853,21 @@ 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.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "צור קטגוריה"
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index e39b5efba..37b2203f7 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "i"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr "(popravljeno)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(nije poslano odgovornom tijelu)"
 
@@ -162,17 +162,17 @@ msgstr "(nije poslano odgovornom tijelu)"
 msgid "(optional)"
 msgstr "(nije obavezno)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(poslano na obje adrese)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Izaberi kategoriju --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Izaberite vrstu posjeda --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>No</strong> Potvrdi moje ažuriranje e-mailom"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong> prijavi se e-mailom"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Da</strong> Imam password"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "Dodano %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Još jednom:"
@@ -310,6 +332,12 @@ msgstr "Upozorenje %d onemogućeno (kreirano%s)"
 msgid "Alert me to future updates"
 msgstr "Javi mi buduće promjene"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Sve Prijave"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Jeste li programer?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "Onemogući e-mail adrese"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr " Postotak popravaka za kategoriju > staro 4 tjedna"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr " Postotak popravaka za kategoriju > staro 4 tjedna"
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategorija: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Zatvoreno"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Zatvorilo je odgovorno tijelo"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,11 @@ msgstr "Cobrand podaci:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "korištena karta"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr "Kontaktiraj tim"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Nepoznati korisnik"
 
@@ -736,6 +788,33 @@ msgstr "Vijeće"
 msgid "Council contacts for %s"
 msgstr "Kontakti vijeća za  %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "Ova prijava je trenutno označena kao zatvorena."
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "označeno kao popravljeno"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "odgovorno tijelo ref:&nbsp;%s"
@@ -760,15 +839,15 @@ msgstr "Kreiraj izvješće"
 msgid "Create category"
 msgstr "Kreiraj kategoriju"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +891,11 @@ msgstr "Nadzorna ploča"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +909,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Izbrisano"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +950,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Spremi promjene"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,22 +981,24 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 msgid "Duplicates"
 msgstr ""
 
@@ -914,8 +1010,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -929,28 +1025,28 @@ msgid "Edit"
 msgstr "Uredi"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -989,7 +1085,7 @@ msgstr "Urednik"
 msgid "Email"
 msgstr "E-mail"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "E-mail dodan na listu zloupotrebe"
 
@@ -1007,7 +1103,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-mail je već na listi zloupotrebe"
 
@@ -1052,7 +1148,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta"
 
@@ -1086,8 +1182,8 @@ msgstr "Unesi detalje o problemu"
 msgid "Error"
 msgstr "Greška"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1101,14 +1197,22 @@ msgid "Examples:"
 msgstr "Primjeri:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1117,6 +1221,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1137,8 +1242,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dodatni podaci:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1163,10 +1268,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1174,6 +1281,8 @@ msgstr "Popravljeno"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Popravljeno - odgovorno tijelo"
 
@@ -1182,7 +1291,7 @@ msgstr "Popravljeno - odgovorno tijelo"
 msgid "Fixed - User"
 msgstr "Popravljeno - Korisnik"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1191,7 +1300,7 @@ msgid "Fixed:"
 msgstr "Popravljeno:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1277,11 +1386,13 @@ msgstr "Prijavi se na RSS izvor"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Idi"
@@ -1290,11 +1401,11 @@ msgstr "Idi"
 msgid "Going to send questionnaire?"
 msgstr "Pošalji upitnik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Grafikon nastanka problema prema položaju tijekom vremena"
 
@@ -1310,7 +1421,7 @@ msgstr "Je li ovaj problem popravljen?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi put?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1335,6 +1446,9 @@ msgstr "Zdravo %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1342,6 +1456,11 @@ msgstr "Zdravo %s"
 msgid "Hidden"
 msgstr "Skriveno"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Ponovno pošalji prijavu"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Sakrij staro"
@@ -1350,6 +1469,10 @@ msgstr "Sakrij staro"
 msgid "Hide pins"
 msgstr "Sakrij pinove"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Povijest"
@@ -1381,7 +1504,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.⏎\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1399,6 +1522,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1409,7 +1536,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1467,8 +1594,8 @@ msgstr "Ilegalan ID"
 msgid "Illegal feed selection"
 msgstr "Ilegalan odabir izvora"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1486,7 +1613,9 @@ msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vr
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1504,7 +1633,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Uključi nepotvrđene prijave"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Pogrešno ima_foto vrijednost\"%s\""
 
@@ -1512,7 +1641,7 @@ msgstr "Pogrešno ima_foto vrijednost\"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1522,33 +1651,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Nevažeća odgovorna_vrijednost agencije %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Nevažeći datum završetka"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Naveden nevažeći %s format."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Nevažeći datum početka"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1579,6 +1716,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Ostani prijavljen na ovom računalu"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Posljednje ažuriranje"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1592,11 +1738,12 @@ msgstr "Posljednje ažuriranje"
 msgid "Last&nbsp;update:"
 msgstr "Posljednje&nbsp;ažuriranje:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1604,6 +1751,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Izlistaj sve prijavljenje probleme"
@@ -1625,7 +1776,8 @@ msgstr "Lokalni RSS izvori i e-mail upozorenja"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokalni RSS izvori i e-mail upozorenja za‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokalna upozorenja"
 
@@ -1633,15 +1785,36 @@ msgstr "Lokalna upozorenja"
 msgid "Locate the problem on a map of the area"
 msgstr "Lociraj problem na mapi područja"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1665,7 +1838,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1685,7 +1858,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Nedostaje nadležni_ID"
 
@@ -1693,7 +1866,7 @@ msgstr "Nedostaje nadležni_ID"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1701,15 +1874,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Prijavio %s za %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Prijavio %s za %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "druga područja:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mjesec"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1717,7 +1907,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1745,7 +1935,7 @@ msgstr "Ime:"
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1754,7 +1944,7 @@ msgstr ""
 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 mapi (automatski generirano pomoću OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Najbliži poštanski broj pokraj oznake na mapi (automatski generiran): %s (%sm away)"
 
@@ -1763,7 +1953,7 @@ msgstr "Najbliži poštanski broj pokraj oznake na mapi (automatski generiran):
 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 mapi (automatski generirano pomoću Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2037,7 @@ msgstr "Novo stanje"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2045,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2074,7 @@ msgstr ""
 msgid "No council"
 msgstr "Nema odgovornog tijela"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Nije odabrano odgovorno tijelo"
 
@@ -1901,6 +2092,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2104,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1951,6 +2152,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2215,14 @@ msgstr "Pošaljite svoje ažuriranje&hellip;"
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Stari / nepoznati <br>problemi"
@@ -2028,7 +2239,7 @@ msgstr "Starije <br>popravljeno"
 msgid "Older <br>problems"
 msgstr "Stariji <br>problemi"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2249,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2296,15 @@ msgstr "Ili problemi prijavljeni:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća &rsquo;:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Drugo"
 
@@ -2125,11 +2339,11 @@ msgstr "Lozinka (neobvezno)"
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2410,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2437,14 @@ msgid "Please check your email address is correct"
 msgstr "Provjerite je li vaša e-mail adresa točna"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Izaberi kategoriju"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Izaberi tip imovine"
 
@@ -2256,8 +2470,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Unesi poruku"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2486,13 @@ msgid "Please enter a password"
 msgstr "Unesi lozinku"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Unesi predmet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2505,7 @@ msgstr "Unesi valjani e-mail"
 msgid "Please enter a valid email address"
 msgstr "Unesi valjanu e-mail adresu"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Unesi detalje"
@@ -2318,14 +2532,14 @@ msgstr "Unesi svoju e-mail adresu"
 msgid "Please enter your first name"
 msgstr "Unesi svoje ime"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2602,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Napominjemo:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2635,10 @@ msgstr "Izaberite tip upozorenja koji želite"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Navedite je li problem rješen  "
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2661,15 @@ msgstr "Objavi"
 msgid "Posted anonymously at %s"
 msgstr "Objavljeno anonimno na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Objavio %s na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Objavio <strong>%s</strong> (%s) na %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Objavio <strong>%s</strong> na %s"
 
@@ -2471,12 +2685,12 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2519,7 +2733,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s"
 msgid "Problem breakdown by state"
 msgstr "Analiza problema prema stanju"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem označen kao otvoren."
 
@@ -2527,7 +2741,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemi"
@@ -2548,13 +2762,13 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemi unutar%.1fkm od ove lokacije"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemi unutar %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemi unutar %s ward"
 
@@ -2599,7 +2813,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2635,11 +2849,11 @@ msgstr "Upitnik popunila osoba koja je prijavila problem"
 msgid "RSS feed"
 msgstr "RSS izvor"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS izvor za %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS izvor za %s ward, %s"
 
@@ -2647,11 +2861,11 @@ msgstr "RSS izvor za %s ward, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS izvor za %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS izvor za %s, unutar %s ward"
 
@@ -2659,13 +2873,13 @@ msgstr "RSS izvor za %s, unutar %s ward"
 msgid "RSS feed of nearby problems"
 msgstr "RSS izvor za okolne probleme"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS izvor za probleme unutar %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS izvor za probleme unutar %s ward"
 
@@ -2684,7 +2898,7 @@ msgstr "RSS izvor za ažuriranja ovog problema"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2702,7 +2916,7 @@ msgstr "Nedavno<br>popravljeno"
 msgid "Recently reported problems"
 msgstr "Nedavno prijavljeni problemi"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2741,12 +2955,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Prijavi problem"
@@ -2764,6 +2978,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Prijava za %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Prijavi zloupotrebu"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2775,7 +2994,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Prijavljeno anonimno %s"
@@ -2785,7 +3004,7 @@ msgstr "Prijavljeno anonimno %s"
 msgid "Reported before"
 msgstr "Prije prijavljeno"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Prijavio %s za %s"
@@ -2799,27 +3018,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Prijavljeno %s u kategoriju anonimno u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Prijavio %s u kategoriju %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Prijavio %s anonimno %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Prijavio %s %s u %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Prijavio %s u %s kategoriju %s u %s"
 
@@ -2843,11 +3062,12 @@ msgstr "Prijavljivanje problema"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2855,10 +3075,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2867,7 +3083,12 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Prijavi problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2879,10 +3100,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Ponovno pošalji prijavu"
@@ -2914,6 +3131,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2929,15 +3158,15 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Cestovni operater za ovu imenovanu cestu  (sa OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2949,35 +3178,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Spremi promjene"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Pretraži prijave"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Pretraži korisnike"
 
@@ -3004,7 +3241,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3038,7 +3275,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Pošalji %s %s naknadno"
 
@@ -3051,7 +3288,7 @@ msgstr "Poslano:"
 msgid "Service:"
 msgstr "Servis:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3059,6 +3296,7 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3068,6 +3306,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3075,23 +3314,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Prikaži staro"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Prikaži moje ime javno"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Prikaži moje ime javno"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Prikaži staro"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Prikaži staro"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Prikaži pinove"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3131,7 +3390,7 @@ msgstr "Fotografije nedavnih prijava"
 msgid "Some text to localize"
 msgstr "Tekst za lakšu lokalizaciju"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3162,15 +3421,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3188,12 +3453,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stanje"
@@ -3209,7 +3474,7 @@ msgstr "Stanje:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3230,7 +3495,7 @@ msgstr "I dalje otvoreno, putem upitnika %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3258,7 +3523,7 @@ msgstr "Pošalji"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3315,11 +3580,11 @@ msgstr "Sažetak"
 msgid "Summary reports"
 msgstr "Sažetak prijava"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3382,7 +3647,7 @@ msgstr "Hvala na učitavanju slike. Sada trebamo locirati problem pa vas molimo
 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 "Hvala, drago nam je čuti da je problem riješen! Htjeli bismo vas još samo upitati jeste li dosada prijavljivali problem odgovornom tijelu?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno."
 
@@ -3396,7 +3661,7 @@ msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Žao nam je, poštanski broj nije prepoznat."
 
@@ -3552,7 +3817,7 @@ msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte po
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3626,18 +3891,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma odgovornim tijelima koji pokrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko  problem ne ulazi u vaše područje  ili nam javite o kakvoj je kategoriji problema riječ kako bismo ga unijeli u naš sustav."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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 ukoliko niste nadležni za ovaj problem."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Potrebna informacija"
 
@@ -3653,14 +3918,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Problem je riješen"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Problem još nije riješen"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Problem još nije riješen"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3708,7 +3978,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3739,8 +4009,26 @@ msgstr "Karta točne lokacije ovog problema"
 msgid "Total"
 msgstr "Ukupno"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "označeno kao popravljeno"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3748,7 +4036,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3773,7 +4061,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Nepotvrđeno"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3797,6 +4086,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr "Nepoznat IB problema"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3853,10 +4146,10 @@ msgstr "Status ažuriranja"
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3900,26 +4193,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Korisnička oznaka uklonjena"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Korisnik označen"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "označeno kao popravljeno"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Korisnici"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3950,6 +4249,15 @@ msgstr "Prikaz lokacije"
 msgid "Viewing a problem"
 msgstr "Prikaz problema"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Općine ove županije"
@@ -3969,7 +4277,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, međutim, trenutno nemamo nikakve pojedinosti o njihovom kontaktu. Ako znate odgovarajuću kontakt adresu, molimo Vas da nam se javite."
 
@@ -3986,6 +4294,10 @@ msgstr "Vaše privatne podatke koristimo u skladu s našim <a href=\"/privacy\">
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4003,11 +4315,11 @@ msgstr "Prilikom ažuriranja"
 msgid "When sent"
 msgstr "Prilikom slanja"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4042,10 +4354,16 @@ msgstr "Pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini po
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Godina"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4074,6 +4392,10 @@ msgstr "Da, imam lozinku"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:"
@@ -4117,6 +4439,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4175,7 +4501,7 @@ msgid "Your Reports"
 msgstr "Vaše prijave"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4212,6 +4538,11 @@ msgstr "Vaše informacije će se koristiti isključivo u skladu s našim<a href=
 msgid "Your name"
 msgstr "Ime"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Vaše prijave"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4241,6 +4572,10 @@ msgstr "Vaše prijave"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Vaša ažuriranja"
@@ -4251,7 +4586,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4259,7 +4594,7 @@ msgstr ""
 msgid "by %s"
 msgstr "od %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4287,49 +4622,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr "od %s različitih korisnika"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "manje od minute"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "označeno kao popravljeno"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4340,7 +4675,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4375,8 +4710,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "druga područja:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "ponovno otvoreno"
 
@@ -4397,7 +4732,7 @@ msgstr "lokalno odgovorno tijelo"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "nema oznake jer korisnik nije označio problem na karti"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "ovaj tip "
 
@@ -4405,6 +4740,16 @@ msgstr "ovaj tip "
 msgid "today"
 msgstr "danas"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Ažuriranje"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Ažuriranja"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "korištena karta"
@@ -4422,7 +4767,15 @@ msgstr "korisnik je vlasnik problema"
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4430,7 +4783,7 @@ msgstr[0] "%d dan"
 msgstr[1] "%d dani"
 msgstr[2] "%d dani"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4438,7 +4791,7 @@ msgstr[0] "%d sat"
 msgstr[1] "%d sati"
 msgstr[2] "%d sati"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4446,6 +4799,14 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minute"
 msgstr[2] "%d minute"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minute"
+msgstr[2] "%d minute"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4454,7 +4815,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4462,6 +4823,14 @@ msgstr[0] "%d tjedan"
 msgstr[1] "%d tjedni"
 msgstr[2] "%d tjedni"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4494,6 +4863,14 @@ msgstr[0] "<big>%s</big> ažuriranje za prijavu"
 msgstr[1] "<big>%s</big> ažuriranja za prijavu"
 msgstr[2] "<big>%s</big> ažuriranja za prijavu"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Prijavio %s za %s"
+msgstr[1] "Prijavio %s za %s"
+msgstr[2] "Prijavio %s za %s"
+
 #: 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."
@@ -4509,3 +4886,31 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokaciju."
 msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
 msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
+
+#: templates/web/base/report/_item.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Sve prijave"
+msgstr[1] "Sve prijave"
+msgstr[2] "Sve prijave"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Sve Prijave"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Kreiraj kategoriju"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Prijavio %s za %s"
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
index f76a9dc13..35cfe9a68 100644
--- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/it.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "e"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s quartiere, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s dentro al quartiere %s"
 
@@ -154,7 +154,7 @@ msgstr "(risolto)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(non inviato al Comune)"
 
@@ -162,17 +162,17 @@ msgstr "(non inviato al Comune)"
 msgid "(optional)"
 msgstr "(opzionale)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(inviato ad entrambi)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Scegli una categoria --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Scegli un tipo di proprietà --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>No</strong> Lasciami confermare il mio aggiornamento via email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>No</strong> lasciami entrare con l'email"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Si</strong> Ho già la password"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Aggiungi un'utente"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "Aggiunti %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Ancora:"
@@ -310,6 +332,12 @@ msgstr "Segnalazione %d disabilitata (creata %s)"
 msgid "Alert me to future updates"
 msgstr "Avvisami su futuri aggiornamenti"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Tutte le segnalazioni"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Sei uno sviluppatore?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr "Assegna ad un corpo esterno:"
 msgid "Assign to subdivision:"
 msgstr "Assegna ad una subdivisione:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "Vietare l'indirizzo email"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "Corpi"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "Categoria:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categoria: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Chiuso"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Chiuso dal comune"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,11 @@ msgstr "Dati del Cobrand:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "mappa usata"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr "Contatta il team"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Non posso trovare l'utente"
 
@@ -736,6 +788,31 @@ msgstr "Comune"
 msgid "Council contacts for %s"
 msgstr "I contatti del comune per %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+msgid "Council has marked as closed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+msgid "Council has marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +837,15 @@ msgstr "Crea una segnalazione"
 msgid "Create category"
 msgstr "Crea una categoria"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +889,11 @@ msgstr "Pannello di controllo"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +907,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Eliminato"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +948,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Salva modifiche"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +979,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplica"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplica"
@@ -916,8 +1010,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1025,28 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Modifica dettagli corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1085,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email aggiunta alla lista abusi"
 
@@ -1009,7 +1103,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Email già presente nella lista abusi"
 
@@ -1054,7 +1148,7 @@ msgstr "Punto finale"
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 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à "
 
@@ -1088,8 +1182,8 @@ msgstr "Inserisci i dettagli del problema"
 msgid "Error"
 msgstr "Errore"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1103,14 +1197,22 @@ msgid "Examples:"
 msgstr "Esempi:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1221,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1242,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dati extra:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1268,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1281,8 @@ msgstr "Risolto"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Risolto - Comune"
 
@@ -1184,7 +1291,7 @@ msgstr "Risolto - Comune"
 msgid "Fixed - User"
 msgstr "Risolto - Utente"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1193,7 +1300,7 @@ msgid "Fixed:"
 msgstr "Risolto:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1279,11 +1386,13 @@ msgstr "Dammi un' RSS feed"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Vai"
@@ -1292,11 +1401,11 @@ msgstr "Vai"
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1312,7 +1421,7 @@ msgstr "E' stato risolto questo problema?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa è la tua prima volta?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1446,9 @@ msgstr "Ciao %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1456,11 @@ msgstr "Ciao %s"
 msgid "Hidden"
 msgstr "Nascosto"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Rinvia la segnalazione"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr ""
@@ -1352,6 +1469,10 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Cronologia"
@@ -1383,7 +1504,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1522,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1536,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1594,8 @@ msgstr "ID illegale"
 msgid "Illegal feed selection"
 msgstr "Selezione feed illegale"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1613,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1633,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Includi segnalazioni non confermate"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1641,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1651,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1716,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Lasciami loggato su questo computer"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Ultimo aggiornamento:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1738,12 @@ msgstr "Ultimo aggiornamento:"
 msgid "Last&nbsp;update:"
 msgstr "Ultimo&nbsp;aggiornamento:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1751,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Lista di tutti i problemi segnalati"
@@ -1627,7 +1776,8 @@ msgstr "RSS feed locali ed avvertimenti via email"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "RSS feed locali ed avvertimenti via email per ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Segnalazioni locali"
 
@@ -1635,15 +1785,36 @@ msgstr "Segnalazioni locali"
 msgid "Locate the problem on a map of the area"
 msgstr "Localizza il problema nella mappa della zona"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAPPA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1838,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1858,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1695,7 +1866,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1874,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Segnalato da %s al %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Segnalato da %s al %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "altre aree:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mese"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1907,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1935,7 @@ msgstr "Nome:"
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1944,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1953,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2035,7 @@ msgstr "Nuovo stato"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2043,7 @@ msgstr ""
 msgid "Next"
 msgstr "Prossimo"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2072,7 @@ msgstr "Nessun corpo"
 msgid "No council"
 msgstr "Nessuno comune"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Nessun comune selezionato"
 
@@ -1901,6 +2090,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2102,14 @@ msgstr ""
 msgid "No further updates"
 msgstr "Nessun ulteriore aggiornamento"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Nessun risultato ritornato"
@@ -1951,6 +2150,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2213,14 @@ msgstr "Ora per inserire il tuo aggiornamento&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Vecchi / sconosciuti <br>problemi"
@@ -2028,7 +2237,7 @@ msgstr "Più vecchi <br> risolti"
 msgid "Older <br>problems"
 msgstr "Vecchi <br>problemi"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2247,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2294,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Altro"
 
@@ -2125,11 +2337,11 @@ msgstr "Password (opzionale)"
 msgid "Password:"
 msgstr "Password:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2408,8 @@ msgstr "Inserisci il cursore sulla mappa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2435,14 @@ msgid "Please check your email address is correct"
 msgstr "Per favore controlla che il tuo indirizzo email è corretto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Per favore scegli una categoria"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Per favore scegli un tipo di proprietà"
 
@@ -2256,8 +2468,8 @@ msgstr "Per favore non abusarne&nbsp;&mdash; abusandone il comune svaluterà il
 msgid "Please enter a message"
 msgstr "Per favore inserisci un messaggio"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2484,13 @@ msgid "Please enter a password"
 msgstr "Per favore inserisci la password"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Per favore inserisci il soggetto"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2503,7 @@ msgstr "Per favore inserire un email valida"
 msgid "Please enter a valid email address"
 msgstr "Per favore inserire un indirizzo email valido"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Per favore inserire qualche dettaglio "
@@ -2318,14 +2530,14 @@ msgstr "Per favore inserisci il tuo indirizzo email"
 msgid "Please enter your first name"
 msgstr "Per favore inserisci il tuo nome"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2600,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Attenzione:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2633,10 @@ msgstr "Per favore seleziona il tipo di avvertimento che desideri"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Si prega di indicare se il problema è stato risolto"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2659,15 @@ msgstr "Posta"
 msgid "Posted anonymously at %s"
 msgstr "Postato anonimamente al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Postato da %s al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postato da <strong>%s</strong> (%s) al %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postato da <strong>%s</strong> al %s"
 
@@ -2471,12 +2683,12 @@ msgstr "Precedente"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -2519,7 +2731,7 @@ msgstr "Problema %s inviato al comune %s"
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problema marcato come aperto."
 
@@ -2527,7 +2739,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemi"
@@ -2548,13 +2760,13 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemi dentro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemi dentro %s quartiere"
 
@@ -2600,7 +2812,7 @@ msgstr "Risposte pubbliche:"
 msgid "Public response:"
 msgstr "Risposte pubbliche:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2636,11 +2848,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS feed per %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -2648,11 +2860,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS feed di %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed di %s, dentro al quartiere %s "
 
@@ -2660,13 +2872,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed dei problemi dentro %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed di problemi dentro al quartiere %s "
 
@@ -2685,7 +2897,7 @@ msgstr "RSS feed degli aggiornamenti su questa segnalazione"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2703,7 +2915,7 @@ msgstr "Recentemente <br>risolti"
 msgid "Recently reported problems"
 msgstr "Problemi segnalati di recente"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2742,12 +2954,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Segnala un problema"
@@ -2765,6 +2977,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Segnala un abuso"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2776,7 +2993,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:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Riportati anonimamente al %s"
@@ -2786,7 +3003,7 @@ msgstr "Riportati anonimamente al %s"
 msgid "Reported before"
 msgstr "Segnalati prima"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Segnalato da %s al %s"
@@ -2800,27 +3017,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Riportato nella categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Riportato nella categoria %s anonimamente alle %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2844,11 +3061,12 @@ msgstr "Stai segnalando un problema"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2856,10 +3074,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr "Segnalazioni in attesa di approvazione"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2868,7 +3082,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Segnalazioni pubblicate"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Segnala un problema"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2880,10 +3099,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Rinvia la segnalazione"
@@ -2915,6 +3130,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2930,15 +3157,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2950,35 +3177,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Salva modifiche"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Ricerca Segnalazioni"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Ricerca Utenti"
 
@@ -3005,7 +3240,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3039,7 +3274,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3052,7 +3287,7 @@ msgstr "Inviato:"
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3060,6 +3295,7 @@ msgstr ""
 msgid "Share"
 msgstr "Condividi"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3069,6 +3305,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3076,23 +3313,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Pubblica la foto"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Mostra il mio nome pubblicamente"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Mostra il mio nome pubblicamente"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Pubblica la foto"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3132,7 +3389,7 @@ msgstr "Qualche foto di segnalazioni recenti"
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3163,15 +3420,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3189,12 +3452,12 @@ msgstr "Data di inizio:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Stato"
@@ -3210,7 +3473,7 @@ msgstr "Stato:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3231,7 +3494,7 @@ msgstr "Ancora aperto, attraverso il questionario %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Sottocategoria: %s"
 
@@ -3259,7 +3522,7 @@ msgstr "Invia"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3316,11 +3579,11 @@ msgstr "Sommario"
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3383,7 +3646,7 @@ msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizz
 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 "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3397,7 +3660,7 @@ msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovar
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3553,7 +3816,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3627,18 +3890,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Questa email è stata inviata ad entrambi i comuni che coprono la zona del problema, visto che l'utente non ha aggiunto una categoria; per favore ignorate l'email se non siete il comune corretto che deve gestire il problema, o fateci sapere qual'e la categoria di questo problema così da poterla aggiungere nel nostro sistema."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Questa informazione è richiesta"
 
@@ -3654,14 +3917,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Questo problema è stato risolto"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Questo problema non è stato risolto"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Questo problema non è stato risolto"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3709,7 +3977,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3740,8 +4008,26 @@ msgstr ""
 msgid "Total"
 msgstr "Totale"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "Aggiorna segnalazione come risolta"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3749,7 +4035,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3774,7 +4060,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Non confermato"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3798,6 +4085,10 @@ msgstr "Errore sconosciuto"
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3854,10 +4145,10 @@ msgstr ""
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3901,26 +4192,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "Aggiorna segnalazione come risolta"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Utenti"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3951,6 +4248,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3970,7 +4276,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3987,6 +4293,10 @@ msgstr "Useremo le tue informazioni personali solo in accordo con la nostra  <a
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4004,11 +4314,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4043,10 +4353,16 @@ msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di d
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Anno"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4075,6 +4391,10 @@ msgstr "Si ho già la password"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4118,6 +4438,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Hai rifiutato; Per favore riempi il box qui sopra "
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4176,7 +4500,7 @@ msgid "Your Reports"
 msgstr "Tue segnalazioni"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4213,6 +4537,11 @@ msgstr ""
 msgid "Your name"
 msgstr "Il tuo nome"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Tue segnalazioni"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4242,6 +4571,10 @@ msgstr "Tue segnalazioni"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -4252,7 +4585,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4260,7 +4593,7 @@ msgstr ""
 msgid "by %s"
 msgstr "da %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4288,49 +4621,49 @@ msgstr "Modifica utente"
 msgid "from %s different users"
 msgstr "da %s utenti differenti"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ultimo aggiornamento %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "meno di un minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4341,7 +4674,7 @@ msgid "n/a"
 msgstr "non disponibile"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4376,8 +4709,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "altre aree:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "riaperto"
 
@@ -4398,7 +4731,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4406,6 +4739,16 @@ msgstr ""
 msgid "today"
 msgstr "oggi"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Aggiornato"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Aggiornamenti"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "mappa usata"
@@ -4423,27 +4766,41 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minuti"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4451,13 +4808,20 @@ msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4486,6 +4850,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni"
 msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Segnalato da %s al %s"
+msgstr[1] "Segnalato da %s al %s"
+
 #: 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."
@@ -4499,3 +4870,33 @@ 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] "Non abbiamo ancora i dettagli sul comune che copre questa zona."
 msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "ultimo aggiornamento %s"
+msgstr[1] "ultimo aggiornamento %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Tutte le segnalazioni"
+msgstr[1] "Tutte le segnalazioni"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Tutte le segnalazioni"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Crea una categoria"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Segnalato da %s al %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "ultimo aggiornamento %s"
diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4ae0de14a..87569324f 100644
--- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/lt_LT.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paulius Zaleckas <paulius.zaleckas@gmail.com>, 2017\n"
 "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "ir"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s rajonas, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, viduje %s rajonas"
 
@@ -154,7 +154,7 @@ msgstr "(atlikta)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietimas)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(neišsiųsta savivaldybei)"
 
@@ -162,17 +162,17 @@ msgstr "(neišsiųsta savivaldybei)"
 msgid "(optional)"
 msgstr "(pasirinktinai)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(išsiųsta į abu)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Išsirinktite kategorija --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Pasirinkite nuosavybės tipą --"
 
@@ -184,6 +184,14 @@ msgstr "--Išsirinkinte šabloną--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).<br>\n"
 "Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimą el. paštu"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ne</strong> leisti man prisijungti el. paštu"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 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."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong>Pastaba:</strong> Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti."
 
@@ -235,6 +251,8 @@ msgstr "<strong>Taip</strong> Aš turiu slaptažodį"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -280,15 +298,15 @@ msgstr "Įdėti į trumpajį sąrašą"
 msgid "Add user"
 msgstr "Pridėti vartotoją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Pridėti/redaguoti problemų kategorijas"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Pridėti/redaguoti atsakymų prioritetus"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Pridėti/redaguoti atsakymo šablonus"
 
@@ -300,6 +318,10 @@ msgstr "Pridėta %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Dar kartą:"
@@ -316,6 +338,12 @@ msgstr ""
 msgid "Alert me to future updates"
 msgstr "Įspėti mane apie atnaujinimus"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -325,12 +353,14 @@ msgstr "Visi Pranešimai"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -365,11 +395,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Ar esi aplikacijų kūrėjas?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -406,7 +437,7 @@ msgstr "Priskirti išoriniai institucijai:"
 msgid "Assign to subdivision:"
 msgstr "Priskirti padaliniui:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -432,15 +463,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Laukiama "
@@ -458,7 +497,7 @@ msgid "Ban email address"
 msgstr "Drausti el. paštą"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -467,7 +506,7 @@ msgid "Bodies"
 msgstr "Institucijos"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -495,14 +534,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -513,7 +553,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategorija"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -523,6 +563,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -530,7 +571,7 @@ msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo"
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategorija: %s"
 
@@ -598,10 +639,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -632,10 +677,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -643,11 +690,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Uždaryta"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Uždaryta "
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -673,6 +720,10 @@ msgstr "Cobrand informacija:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -736,8 +787,8 @@ msgstr "Susisiekite su komanda"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Vartotojas nerastas"
 
@@ -755,6 +806,31 @@ msgstr "Savivaldybė"
 msgid "Council contacts for %s"
 msgstr "Tarybos kontaktai skirti %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+msgid "Council has marked as closed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+msgid "Council has marked as fixed"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -779,15 +855,15 @@ msgstr "Sukurti pranešimą"
 msgid "Create category"
 msgstr "Sukurti kategoriją"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -831,7 +907,11 @@ msgstr "Įrankių juosta"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Padalinys atliko per 5 darbo dienas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -845,6 +925,11 @@ msgstr "Pašalinti šabloną"
 msgid "Deleted"
 msgstr "Ištrinta"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -881,6 +966,11 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Diligency prize league table"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+msgid "Discard changes"
+msgstr ""
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -906,23 +996,25 @@ msgstr "Nepatinka anketos?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Kopija"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Kopija"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Kopija"
@@ -938,8 +1030,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -953,28 +1045,28 @@ msgid "Edit"
 msgstr "Redaguoti"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Redaguoti institucijos informaciją"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1013,7 +1105,7 @@ msgstr "Redaktorius"
 msgid "Email"
 msgstr "El. paštas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo"
 
@@ -1031,7 +1123,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "El. paštas jau yra piktnaudžiavimo sąraše"
 
@@ -1083,7 +1175,7 @@ msgstr "Pabaigos taškas"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Įveskite Z&uuml;rich gatvės pavadinimą"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną"
 
@@ -1117,8 +1209,8 @@ msgstr "įveskite problemos detales"
 msgid "Error"
 msgstr "Klaida"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1132,14 +1224,22 @@ msgid "Examples:"
 msgstr "Pavyzdžiai:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1148,6 +1248,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1168,8 +1269,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Papildoma informacija:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1194,10 +1295,12 @@ msgstr "Suvarkyti tai pasirenkant <strong>pažymėta vietovę</strong>  <em>Reda
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1205,6 +1308,8 @@ msgstr "Sutvarkyta"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Sutvarkyta - Savivaldybe"
 
@@ -1213,7 +1318,7 @@ msgstr "Sutvarkyta - Savivaldybe"
 msgid "Fixed - User"
 msgstr "Sutvarkyta - Vartotojas"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1222,7 +1327,7 @@ msgid "Fixed:"
 msgstr "Sutvarkyta:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Pažymeti kaip ištrinta"
@@ -1308,11 +1413,13 @@ msgstr "Suteikti man RSS srautą"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Pirmyn"
@@ -1321,11 +1428,11 @@ msgstr "Pirmyn"
 msgid "Going to send questionnaire?"
 msgstr "Ar ruošiates išsiųsti klausimyną?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Problemų sukurimo grafikas pagal statusą per laiką"
 
@@ -1341,7 +1448,7 @@ msgstr "Ar ši problema buvo sutvarkyta?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Ar esate pranešęs apie problema anksčiau, o gal tai pirmas kartas?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1366,6 +1473,9 @@ msgstr "Labas %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1373,6 +1483,11 @@ msgstr "Labas %s"
 msgid "Hidden"
 msgstr "Paslėpta"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Pridėti nepatvirtintus pranešimus"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Paslėpti senus"
@@ -1381,6 +1496,10 @@ msgstr "Paslėpti senus"
 msgid "Hide pins"
 msgstr "Paslėpti smeigtukus"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Istorija"
@@ -1412,7 +1531,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1432,6 +1551,10 @@ msgstr ""
 "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."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1444,7 +1567,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1510,8 +1633,8 @@ msgstr "Neteisėtas ID"
 msgid "Illegal feed selection"
 msgstr "Neteisėtas srauto pasirinkimas"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1529,7 +1652,9 @@ msgstr "In addition, the following attributes that are not part of the Open311 v
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1547,7 +1672,7 @@ msgstr "Pridėti siuntėjo asmeninę informacija"
 msgid "Include unconfirmed reports"
 msgstr "Pridėti nepatvirtintus pranešimus"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Incorrect has_photo value \"%s\""
 
@@ -1555,7 +1680,7 @@ msgstr "Incorrect has_photo value \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1565,33 +1690,41 @@ msgstr "Internal notes"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Internal referral"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Invalid agency_responsible value %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Klaidina pabaigos data"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Pasirinktas klaidingas formatas %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Klaidinga pradžios data"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1622,6 +1755,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Palikti mane prisijungusi su šiuo komputeriu"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Paskutinis atnaujinimas:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1635,11 +1777,12 @@ msgstr "Paskutinis atnaujinimas:"
 msgid "Last&nbsp;update:"
 msgstr "Last&nbsp;update:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1647,6 +1790,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Palikite neužpildyta jeigu visi pranešimai šioje dalyje turi buti išsiųsti naudojant tą patį siuntimo metodą (pvz, \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Pateikti visas praneštas problemas"
@@ -1668,7 +1815,8 @@ msgstr "Vietiniai RSS srautai ir el. pašto pranešimai"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Vietiniai RSS srautai ir el. pašto pranešimai skirti ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Vietiniai pranešimai"
 
@@ -1676,15 +1824,36 @@ msgstr "Vietiniai pranešimai"
 msgid "Locate the problem on a map of the area"
 msgstr "Nustatytį problemos vietą žemėlapyje"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "MAP"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1708,7 +1877,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1728,7 +1897,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Missing jurisdiction_id"
 
@@ -1736,7 +1905,7 @@ msgstr "Missing jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1744,15 +1913,29 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+msgid "Moderate this update"
+msgstr ""
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+msgid "Moderated by %s at %s"
+msgstr ""
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderated by division within one working day"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mėnuo"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1760,7 +1943,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1788,7 +1971,7 @@ msgstr "Vardas:"
 msgid "Name: %s"
 msgstr "Vardas: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1797,7 +1980,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1806,7 +1989,7 @@ msgstr "Artimiausias pašto kodas esantis šalia smeigtuko žemėlapyje (sugener
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1890,7 +2073,7 @@ msgstr "New state"
 msgid "New template"
 msgstr "Naujas šablonas"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1898,6 +2081,7 @@ msgstr ""
 msgid "Next"
 msgstr "Kitas"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1926,7 +2110,7 @@ msgstr "Nėra institucijos"
 msgid "No council"
 msgstr "Nėra savivaldybės"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Nepasirinkta savivaldybė"
 
@@ -1944,6 +2128,8 @@ msgstr "Pažymėti vartotojai nerasti."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1954,6 +2140,14 @@ msgstr ""
 msgid "No further updates"
 msgstr "Jokių kitų atnaujinimai"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Jokių rezultatų"
@@ -2000,6 +2194,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2061,6 +2257,14 @@ msgstr "Dabar patvirtinti jūsų update&hellip;"
 msgid "OK"
 msgstr "Gerai"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Senos/ nežinomos <br>problemos"
@@ -2077,7 +2281,7 @@ msgstr "Senesnis <br>sutvarkyta"
 msgid "Older <br>problems"
 msgstr "Senesnės <br>problemos"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2087,7 +2291,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2131,15 +2338,15 @@ msgstr "Arba problemos praneštos:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Arba jūs galite prenumeruoti įspėjimą atsižvelgiant į jūsų rajoną arba savivaldybę:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Kita"
 
@@ -2174,11 +2381,11 @@ msgstr "Slaptažodis (nebūtina)"
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2245,8 +2452,8 @@ msgstr "Padėkite smeigtuką ant žemėlapio"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2272,14 +2479,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Prašome pasirinkti kategoriją"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Prašome pasirinkti nuosavybės tipą"
 
@@ -2305,8 +2512,8 @@ msgstr "Prašome neįžeidinėti&nbsp;&mdash; įžeidinėjimai nuvertina paslaug
 msgid "Please enter a message"
 msgstr "Prašome įvesti žinutę"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2321,13 +2528,13 @@ msgid "Please enter a password"
 msgstr "Prašome įvesti slaptažodį"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Prašome įvesti temą"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2340,7 +2547,7 @@ 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/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Prašome įvesti daugiau informacijos"
@@ -2367,14 +2574,14 @@ msgstr "Prašome įvesti savo el. pašto adresą"
 msgid "Please enter your first name"
 msgstr "Prašome įvesti savo vardą"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2437,7 +2644,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Atkreipkite dėmėsį:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2470,10 +2677,10 @@ msgstr "Prašome pasirinkti pageidaujama įspėjimo tipą"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Prašome nurodyti, ar problema buvo sutvarkyta"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2496,15 +2703,15 @@ msgstr "Įkelti"
 msgid "Posted anonymously at %s"
 msgstr "Pateikta anonimiškai %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2520,12 +2727,12 @@ msgstr "Ankstesnis"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Privatumas"
 
@@ -2568,7 +2775,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:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problema pažymėta kaip atidaryta"
 
@@ -2576,7 +2783,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemos"
@@ -2597,13 +2804,13 @@ msgstr "Neseniai praneštos problemos FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemos %.1fkm atstumu aplink šią vietovę"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemos viduje %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemos %s rajone"
 
@@ -2649,7 +2856,7 @@ msgstr "Viešas atsakymas:"
 msgid "Public response:"
 msgstr "Viešas atsakymas:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2685,11 +2892,11 @@ msgstr "Questionnaire filled in by problem reporter"
 msgid "RSS feed"
 msgstr "RSS srautas"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS srautas skirtas %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS srautas skirtas %s rajonui, %s"
 
@@ -2697,11 +2904,11 @@ msgstr "RSS srautas skirtas %s rajonui, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS srautas %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS srautas %s, viduje %s rajono"
 
@@ -2709,13 +2916,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2734,7 +2941,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2752,7 +2959,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2791,12 +2998,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
@@ -2814,6 +3021,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "New state"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2825,7 +3037,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2835,7 +3047,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2849,27 +3061,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2893,11 +3105,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2905,10 +3118,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2917,7 +3126,11 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+msgid "Reports saved offline."
+msgstr ""
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2929,10 +3142,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2964,6 +3173,18 @@ msgstr "Atsakymo Šablonai"
 msgid "Response Templates for %s"
 msgstr "%s Atsakymo Šablonai"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2979,15 +3200,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2999,35 +3220,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3054,7 +3283,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3088,7 +3317,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3101,7 +3330,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3109,6 +3338,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3118,6 +3348,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3125,23 +3356,42 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Paskelbti nuotrauką"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Paskelbti nuotrauką"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3181,7 +3431,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3212,15 +3462,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3238,12 +3494,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
@@ -3259,7 +3515,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3280,7 +3536,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3308,7 +3564,7 @@ msgstr ""
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3365,11 +3621,11 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3432,7 +3688,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3446,7 +3702,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3602,7 +3858,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3676,18 +3932,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3703,14 +3959,18 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/update/form_update.html:54
+msgid "This problem is still ongoing"
+msgstr ""
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3758,7 +4018,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3789,8 +4049,26 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "Problema pažymėta kaip atidaryta"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3798,7 +4076,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3823,7 +4101,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3847,6 +4126,11 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Įdėti į trumpajį sąrašą"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3903,10 +4187,10 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3950,26 +4234,31 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+msgid "User has marked as fixed"
+msgstr ""
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4000,6 +4289,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -4019,7 +4317,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -4036,6 +4334,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4053,11 +4355,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4092,10 +4394,16 @@ msgstr ""
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4124,6 +4432,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4167,6 +4479,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4225,7 +4541,7 @@ msgid "Your Reports"
 msgstr ""
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4262,6 +4578,10 @@ msgstr ""
 msgid "Your name"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:62
+msgid "Your offline reports"
+msgstr ""
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4291,6 +4611,10 @@ msgstr ""
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -4301,7 +4625,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4309,7 +4633,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4337,49 +4661,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4390,7 +4714,7 @@ msgid "n/a"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4425,8 +4749,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -4447,7 +4771,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4455,6 +4779,16 @@ msgstr ""
 msgid "today"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Gauti atnaujinimus"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Gauti atnaujinimus"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4472,7 +4806,15 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4480,7 +4822,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4488,7 +4830,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4496,6 +4838,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "Mėnuo"
+msgstr[1] "Mėnuo"
+msgstr[2] "Mėnuo"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4504,7 +4854,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4512,6 +4862,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4544,6 +4902,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: templates/web/base/report/_item.html:49
+#, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: 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."
@@ -4559,3 +4925,27 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: templates/web/base/report/_item.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Visi pranešimai"
+msgstr[1] "Visi pranešimai"
+msgstr[2] "Visi pranešimai"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Visi Pranešimai"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Sukurti kategoriją"
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index f21f3ad03..2071a76f2 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " dan "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s kawasan pentadbiran, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, dalam kawasan pentadbiran %s"
 
@@ -154,7 +154,7 @@ msgstr "(tetap)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(tidak dihantar kepada majlis)"
 
@@ -162,17 +162,17 @@ msgstr "(tidak dihantar kepada majlis)"
 msgid "(optional)"
 msgstr "(tidak diwajibkan)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(hantar kepada kedua-dua)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Pilih kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Pilih jenis harta --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
 "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -235,6 +251,8 @@ msgstr "<strong>Ya</strong> Aku ada kata laluan"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,15 +295,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Tambah pengguna"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -297,6 +315,10 @@ msgstr "%s telah ditambahi"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Sekali lagi:"
@@ -313,6 +335,12 @@ msgstr "Pemberitahuan %d dihenti (dibuat pada %s)"
 msgid "Alert me to future updates"
 msgstr "Maklumkan aku sebarang kemas kini masa depan"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -322,12 +350,14 @@ msgstr "Semua Laporan"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -362,11 +392,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Adakan anda developer?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -403,7 +434,7 @@ msgstr "Ditugaskan kepada badan luaran:"
 msgid "Assign to subdivision:"
 msgstr "Ditugaskan kepada bahagian bawah:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -429,15 +460,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Mengunggu penyederhanaan"
@@ -455,7 +494,7 @@ msgid "Ban email address"
 msgstr "Melarang alamat emel"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -464,7 +503,7 @@ msgid "Bodies"
 msgstr "Badan"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -492,14 +531,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -510,7 +550,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -520,6 +560,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Kategori rata masalah diselesai > 4 minggu"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -527,7 +568,7 @@ msgstr "Kategori rata masalah diselesai > 4 minggu"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -582,10 +623,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -616,10 +661,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -627,11 +674,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Ditutup"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Ditutup oleh majlis"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -657,6 +704,11 @@ msgstr "Data Cobrand"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "peta diguna"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -720,8 +772,8 @@ msgstr "Menghubungi pasukan"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Tidak dapat mencari pengguna"
 
@@ -739,6 +791,36 @@ msgstr "Majlis"
 msgid "Council contacts for %s"
 msgstr "Hubungan Majlis untuk %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "ditanda sebagai ditutupi"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "ditanda sebagai diselesai"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "ditanda sebagai dijalani"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "ditanda sebagai disiasati"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "ditanda sebagai dijadual"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Rujukan majlis:&nbsp;%s"
@@ -763,15 +845,15 @@ msgstr "Laporan baru"
 msgid "Create category"
 msgstr "Kategori baru"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -815,7 +897,11 @@ msgstr "Papan pemuka"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -829,6 +915,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Dipadam"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -865,6 +956,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Jadual liga hadiah ketekunan"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Hantar perubahan"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -890,23 +987,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Salinan"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Salinan"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Salinan"
@@ -919,8 +1018,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -934,28 +1033,28 @@ msgid "Edit"
 msgstr "Menyunting"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Edit perincian badah"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -994,7 +1093,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Emel"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Emel ditambahkan kepada senarai penyalahguna"
 
@@ -1012,7 +1111,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Emel telah dalam senarai penyalahguna"
 
@@ -1057,7 +1156,7 @@ msgstr "Endpoint"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Masukkan nama jalan Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan"
 
@@ -1091,8 +1190,8 @@ msgstr "Masukkan perincian masalah tersebut"
 msgid "Error"
 msgstr "Ralat"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1106,14 +1205,22 @@ msgid "Examples:"
 msgstr "Contoh:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1122,6 +1229,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1142,8 +1250,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Data tambahan:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1168,10 +1276,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1179,6 +1289,8 @@ msgstr "Diselesai"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Diselesai - Majlis"
 
@@ -1187,7 +1299,7 @@ msgstr "Diselesai - Majlis"
 msgid "Fixed - User"
 msgstr "Diselesai - Pengguna"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1196,7 +1308,7 @@ msgid "Fixed:"
 msgstr "Selesai:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Tanda sebagai dipadam"
@@ -1282,11 +1394,13 @@ msgstr "Berikan aku RSS feed"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Pergi"
@@ -1295,11 +1409,11 @@ msgstr "Pergi"
 msgid "Going to send questionnaire?"
 msgstr "Teruskan dengan menghantar soalan selidik?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graf masalah dibuat dengan status dari masa ke masa"
 
@@ -1315,7 +1429,7 @@ msgstr "Adakan masalah ini telah diselesai?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1340,6 +1454,9 @@ msgstr "Hi %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1347,6 +1464,11 @@ msgstr "Hi %s"
 msgid "Hidden"
 msgstr "Tersembunyi"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Termasuk laporan yang belum disahkan"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Sembunyikan lama"
@@ -1355,6 +1477,10 @@ msgstr "Sembunyikan lama"
 msgid "Hide pins"
 msgstr "Sembunyikan pin"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Sejarah"
@@ -1386,7 +1512,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1404,6 +1530,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1414,7 +1544,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1472,8 +1602,8 @@ msgstr "ID tak sah"
 msgid "Illegal feed selection"
 msgstr "Pilihan feed yang tak sah"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1491,7 +1621,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1509,7 +1641,7 @@ msgstr "Termasuk perincian peribadi pelapor"
 msgid "Include unconfirmed reports"
 msgstr "Termasuk laporan yang belum disahkan"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Nilai has_photo \"%s\" salah"
 
@@ -1517,7 +1649,7 @@ msgstr "Nilai has_photo \"%s\" salah"
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1527,33 +1659,41 @@ msgstr "Nota dalaman"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Rujukan dalaman"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Nilai agency_responsible %s salah"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Tarikh berakhir yang tak sah"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Format dinyatakan %s salah"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Tarikh mula yang tak sah"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1584,6 +1724,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Teruskan log masuk aku dalam komputer ini"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Kemas kini terakhir:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1597,11 +1746,12 @@ msgstr "Kemas kini terakhir:"
 msgid "Last&nbsp;update:"
 msgstr "Kemas kini terakhir:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1609,6 +1759,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Senaraikan semua laporan masalah"
@@ -1630,7 +1784,8 @@ msgstr "RSS feed tempatan dan pemberitahuan emel"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Pemberitahuan tempatan"
 
@@ -1638,15 +1793,36 @@ msgstr "Pemberitahuan tempatan"
 msgid "Locate the problem on a map of the area"
 msgstr "Mengesan masalah dalam kawasan atas peta"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "PETA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1670,7 +1846,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1690,7 +1866,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Kehilangan jurisdiction_id"
 
@@ -1698,7 +1874,7 @@ msgstr "Kehilangan jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1706,15 +1882,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Dipostkan oleh %s pada %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Dipostkan oleh %s pada %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "kawasan lain:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Bulan"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1722,7 +1915,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1750,7 +1943,7 @@ msgstr "Nama:"
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1759,7 +1952,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1768,7 +1961,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1850,7 +2043,7 @@ msgstr "Negeri baru"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1858,6 +2051,7 @@ msgstr ""
 msgid "Next"
 msgstr "Seterusnya"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1886,7 +2080,7 @@ msgstr "Tiada badan"
 msgid "No council"
 msgstr "Tiada majlis"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Tiada majlis dipilihi"
 
@@ -1904,6 +2098,8 @@ msgstr "Belum ada pengguna yang ditanda."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1914,6 +2110,14 @@ msgstr "Tidak dapat diselesai"
 msgid "No further updates"
 msgstr "Tiada kemaskini baru."
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Tiada keputusan."
@@ -1954,6 +2158,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2015,6 +2221,14 @@ msgstr "Hantarkan kemas kini anda sekarang&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -2033,7 +2247,7 @@ msgstr "Lebih tua<br>diselesai"
 msgid "Older <br>problems"
 msgstr "Lebih tua <br>masalah"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2043,7 +2257,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2087,15 +2304,15 @@ msgstr "Atau masalah dilaporkan kepada:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Lain-lain"
 
@@ -2130,11 +2347,11 @@ msgstr "Kata Laluan (tidah diwajibkan)"
 msgid "Password:"
 msgstr "Kata Laluan:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2201,8 +2418,8 @@ msgstr "Letakkan pin atas peta"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2228,14 +2445,14 @@ msgid "Please check your email address is correct"
 msgstr "Sila periksa sama ada alamat emel anda adalah betul"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Sila pilihkan kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Sila pilihkan jenis bangunan"
 
@@ -2261,8 +2478,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Sila masukkan pesanan"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2277,13 +2494,13 @@ msgid "Please enter a password"
 msgstr "Sila masukkan kata laluan"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Sila masukkan tajuk"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2296,7 +2513,7 @@ msgstr "Silah masukkan emel yang benar"
 msgid "Please enter a valid email address"
 msgstr "Sila masukkan alamat emel yang benah"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Sila masukkan perincian"
@@ -2323,14 +2540,14 @@ msgstr "Sila masukkan alamat emel anda"
 msgid "Please enter your first name"
 msgstr "Sila masukkan nama pertama anda"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2393,7 +2610,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Sila  nota:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2426,10 +2643,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2452,15 +2669,15 @@ msgstr "Post"
 msgid "Posted anonymously at %s"
 msgstr "Post tanpa nama pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Dipostkan oleh %s pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Dipostkan oleh <strong>%s</strong> (%s) pada %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Dipostkan oleh <strong>%s</strong> pada %s"
 
@@ -2476,12 +2693,12 @@ msgstr "Sebelumnya"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2524,7 +2741,7 @@ msgstr "Masalah %s dihantar kepada majlis %s"
 msgid "Problem breakdown by state"
 msgstr "Pecahan masalah bagi negeri"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Masalah ditanda sebagai terbukan"
 
@@ -2532,7 +2749,7 @@ msgstr "Masalah ditanda sebagai terbukan"
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Masalah-masalah"
@@ -2553,13 +2770,13 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
 msgid "Problems within %.1fkm of this location"
 msgstr "Masalah dalam %.1fkm dalam lokasi ini"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Masalah dalam kawasan pentadbiran %s"
 
@@ -2605,7 +2822,7 @@ msgstr "Tindak balas awam:"
 msgid "Public response:"
 msgstr "Tindak balas awam:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2641,11 +2858,11 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "Feed RSS untuk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
 
@@ -2653,11 +2870,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "Feed RSS untuk %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
 
@@ -2665,13 +2882,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "Feed RSS untuk masalah dalam %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
 
@@ -2690,7 +2907,7 @@ msgstr "Feed RSS untuk kemas kini bagi masalah ini"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2708,7 +2925,7 @@ msgstr "Diselesai <br>baru-baru ini"
 msgid "Recently reported problems"
 msgstr "Masalah yang dilaporkan baru-baru ini"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2747,12 +2964,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
@@ -2770,6 +2987,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Negeri baru"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2781,7 +3003,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2791,7 +3013,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2805,27 +3027,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2849,11 +3071,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2861,10 +3084,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2873,7 +3092,11 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+msgid "Reports saved offline."
+msgstr ""
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2885,10 +3108,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2920,6 +3139,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2935,15 +3166,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2955,36 +3186,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "ditanda sebagai laporan salinan"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3011,7 +3250,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3045,7 +3284,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Dihantar kepada %s %s kemudian"
 
@@ -3058,7 +3297,7 @@ msgstr "Dihantar:"
 msgid "Service:"
 msgstr "Servis:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3066,6 +3305,7 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3075,6 +3315,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3082,23 +3323,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Tunjukkan lama"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Tunjukkan nama aku secara umum"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Tunjukkan nama aku secara umum"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Tunjukkan lama"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Tunjukkan lama"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Tunjukkan pin"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3138,7 +3399,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3169,15 +3430,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3195,12 +3462,12 @@ msgstr "Tarikh bermula:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Negeri"
@@ -3216,7 +3483,7 @@ msgstr "Negeri:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3237,7 +3504,7 @@ msgstr "Masuk dibuka, melalui soalan selidik, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Subkategori: %s"
 
@@ -3265,7 +3532,7 @@ msgstr "Hantar"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3322,11 +3589,11 @@ msgstr "Ringkasan"
 msgid "Summary reports"
 msgstr "Laporan ringkasan"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3389,7 +3656,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3403,7 +3670,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3559,7 +3826,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3633,18 +3900,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3660,14 +3927,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Masalah ini telah diselesai"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Masalah ini belum diselesai"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Masalah ini belum diselesai"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3715,7 +3987,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3746,8 +4018,26 @@ msgstr "Melihat lokasi tepat atas peta bagi isu ini"
 msgid "Total"
 msgstr "Jumlah"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "ditanda sebagai diselesai"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3755,7 +4045,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3780,7 +4070,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Belum dipastikan"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3804,6 +4095,10 @@ msgstr "Ralat tidak diketahui"
 msgid "Unknown problem ID"
 msgstr "ID masalah tidak diketahui"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3860,10 +4155,10 @@ msgstr "Status kemas kini"
 msgid "Updated"
 msgstr "Dikemas kinikan"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3907,26 +4202,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Tanda pengguna dipadam"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Pengguna ditanda"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "ditanda sebagai diselesai"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Pengguna"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3957,6 +4258,15 @@ msgstr "Melihat lokasi"
 msgid "Viewing a problem"
 msgstr "Melihat masalah"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Kawasan pentadbiran majlis ini"
@@ -3976,7 +4286,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
 msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka"
 
@@ -3993,6 +4303,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4010,11 +4324,11 @@ msgstr "Bila diedit"
 msgid "When sent"
 msgstr "Bila dihantar"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4049,10 +4363,16 @@ msgstr ""
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Tahun"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4081,6 +4401,10 @@ msgstr "Ya aku ada kata laluan"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4124,6 +4448,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Anda menolak; sila isikan kotak di atas"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4185,7 +4513,7 @@ msgid "Your Reports"
 msgstr "Laporan Anda"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4222,6 +4550,11 @@ msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privas
 msgid "Your name"
 msgstr "Nama anda"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Laporan anda"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4251,6 +4584,10 @@ msgstr "Laporan anda"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Kemas kini anda"
@@ -4261,7 +4598,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4269,7 +4606,7 @@ msgstr ""
 msgid "by %s"
 msgstr "dari %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "ditanda sebagai laporan salinan"
 
@@ -4297,49 +4634,49 @@ msgstr "edit pengguna"
 msgid "from %s different users"
 msgstr "dari %s pengguna lain"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "kemaskini yang lepas %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "kurang dari seminit"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "ditanda sebagai tindakan dijadualkan"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "ditanda sebagai rujukan dalaman"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "ditanda sebagai ditutupi"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "ditanda sebagai diselesai"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "ditanda sebagai dijalani"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "ditanda sebagai disiasati"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "ditanda sebagai tak boleh dibaiki"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "ditanda sebagai bukan tanggungjawab majlis"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "ditanda sebagai dijadual"
 
@@ -4350,7 +4687,7 @@ msgid "n/a"
 msgstr "tiada"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4385,8 +4722,8 @@ msgstr "pemasukan asal: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "kawasan lain:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "dibuka semula"
 
@@ -4407,7 +4744,7 @@ msgstr "majlis tempatan"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "jenis masalah tempatan ini"
 
@@ -4415,6 +4752,16 @@ msgstr "jenis masalah tempatan ini"
 msgid "today"
 msgstr "hari ini"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Kemas kini"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Kemas kini"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "peta diguna"
@@ -4432,36 +4779,54 @@ msgstr "pengguna adalah pemilik masalah"
 msgid "ward"
 msgstr "kawasan pentadbiran"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d hari"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d jam"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minit"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minit"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
 msgid_plural "%d supporters"
 msgstr[0] "%d penyokong"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d minggu"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4486,6 +4851,12 @@ msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> laporan dikemaskini"
 
+#: templates/web/base/report/_item.html:49
+#, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] ""
+
 #: 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."
@@ -4497,3 +4868,27 @@ msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang men
 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] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "kemaskini yang lepas %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Semua laporan"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Semua Laporan"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Kategori baru"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "kemaskini yang lepas %s"
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
index 69f9ceff3..9fd9436b5 100644
--- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "ႏွင့္"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%sရပ္ကြက္၊ %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s၊ %s ရပ္ကြက္အတြင္း"
 
@@ -154,7 +154,7 @@ msgstr "(ျပင္ျပီးျပီ)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိႈ္က္စြန္႔ပစ္ျခင္း၊ လမ္းေဘးပလက္ေဖာင္းအုတ္ခဲမ်ားက်ိဳးပဲ့မႈ သို႔မဟုတ္ လမ္းမီးမလာျခင္းကဲ့သို႔)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
 
@@ -162,17 +162,17 @@ msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
 msgid "(optional)"
 msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- ပစၥည္းအမ်ိဳးအစားကိုေရြးပါ --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong>မဟုတ္ပါ</strong> ကၽြႏ္ုပ္၏အသ
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>မဟုတ္ပါ</strong> အီးေမးလ္ျဖင့္၀င္မည္"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "အသံုးျပဳသူထည့္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "%sကိုထည့္ျပီးျပီ"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "ထပ္မံ၍-"
@@ -310,6 +332,12 @@ msgstr "အသိေပးခ်က္%dကိုပိတ္ထားသည္(
 msgid "Alert me to future updates"
 msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္းကၽြႏ္ုပ္ကိုအသိေပးမည္"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "အစီရင္ခံစာအားလံုး"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Developer လား"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္
 msgid "Assign to subdivision:"
 msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း"
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "စာကိုယ္မ်ား"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "အမ်ိဳးအစား"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr "အမ်ိဳးအစား -"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "အမ်ိဳးအစား - %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "ပိတ္မည္"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "ေကာင္စီမွပိတ္ထားသည္"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,11 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "ေျမပံု အသံုးျပဳထားၿပီး"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ"
 
@@ -736,6 +788,36 @@ msgstr "ေကာင္စီ"
 msgid "Council contacts for %s"
 msgstr "%sအတြက္ေကာင္စီအဆက္အသြယ္"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "ပိတ္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "ဆက္လက္လုပ္ေဆာင္ေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "စံုစမ္းစစ္ေဆးေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "စီစဥ္ထားၿပီးျဖစ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "ေကာင္စီ ရည္ညႊန္းခ်က္"
@@ -760,15 +842,15 @@ msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီး
 msgid "Create category"
 msgstr "အမ်ိဳးအစားဖန္တီးမည္"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +894,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +912,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "ဖ်က္ျပီးျပီ"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +953,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +984,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "ႏွစ္ခုျပဳလုပ္မည္"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "ႏွစ္ခုျပဳလုပ္မည္"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "ႏွစ္ခုျပဳလုပ္မည္"
@@ -916,8 +1015,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1030,28 @@ msgid "Edit"
 msgstr "ျပင္ဆင္မည္"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1090,7 @@ msgstr "အယ္ဒီတာ"
 msgid "Email"
 msgstr "အီးေမးလ္"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး"
 
@@ -1009,7 +1108,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး"
 
@@ -1054,7 +1153,7 @@ msgstr "ျပီးဆံုးမွတ္-"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ"
 
@@ -1088,8 +1187,8 @@ msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ
 msgid "Error"
 msgstr "အမွားအယြင္း"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1103,14 +1202,22 @@ msgid "Examples:"
 msgstr "နမူနာမ်ား -"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1226,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1247,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1273,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1286,8 @@ msgstr "ျပင္ျပီးျပီ"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "ျပင္ျပီးျပီ-ေကာင္စီ"
 
@@ -1184,7 +1296,7 @@ msgstr "ျပင္ျပီးျပီ-ေကာင္စီ"
 msgid "Fixed - User"
 msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1193,7 +1305,7 @@ msgid "Fixed:"
 msgstr "ျပင္ျပီးျပီ"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္"
@@ -1279,11 +1391,13 @@ msgstr "ကၽြႏ္ုပ္ကို RSS Feed ေပးပါ"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "သြားမည္"
@@ -1292,11 +1406,11 @@ msgstr "သြားမည္"
 msgid "Going to send questionnaire?"
 msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1312,7 +1426,7 @@ msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးျပ
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "ယခင္က ေကာင္စီထံ ျပႆနာမ်ား အစီရင္ခံဖူးသလား။ သို႔မဟုတ္ ဒါက ပထမဦးဆံုး အႀကိမ္လား?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1451,9 @@ msgstr "မဂၤလာပါ%s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1461,11 @@ msgstr "မဂၤလာပါ%s"
 msgid "Hidden"
 msgstr "ေဖ်ာက္ထားေသာ"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရန္"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "အေဟာင္းေဖ်ာက္ထားေသာ"
@@ -1352,6 +1474,10 @@ msgstr "အေဟာင္းေဖ်ာက္ထားေသာ"
 msgid "Hide pins"
 msgstr ""
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "ရာဇ၀င္"
@@ -1383,7 +1509,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1527,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1541,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1599,8 @@ msgstr "တရားမ၀င္ေသာအိုင္ဒီ"
 msgid "Illegal feed selection"
 msgstr "တရားမ၀င္ေသာအိုင္ဒီ"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1618,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1638,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1514,7 +1646,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1656,41 @@ msgstr "အတြင္းမွတ္စု"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "စမည့္ရက္မမွန္ကန္ပါ"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1721,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "ဒီကြန္ျပဴတာမွာ၀င္ေနေအာင္ျပဳလုပ္မည္"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္း-"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1743,12 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1756,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆနာစာရင္းအားလံုး"
@@ -1627,7 +1781,8 @@ msgstr "ျပည္တြင္း RSS feed မ်ားႏွင့္ အီ
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "‘%s’ အတြက္ ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "ေဒသတြင္းအသိေပးခ်က္"
 
@@ -1635,15 +1790,36 @@ msgstr "ေဒသတြင္းအသိေပးခ်က္"
 msgid "Locate the problem on a map of the area"
 msgstr "ဧရိယာ၏ေျမပံုတစ္ခုတြင္ျပႆနာကိုေနရာသတ္မွတ္မည္"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "ေျမပံု"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1843,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1863,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1695,7 +1871,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1879,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "%s မွာ %s မွတင္ခဲ့သည္"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "%s မွာ %s မွတင္ခဲ့သည္"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "အျခား ဧရိယာမ်ား"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "လ"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1912,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1940,7 @@ msgstr "အမည္-"
 msgid "Name: %s"
 msgstr "အမည္ - %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1949,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1765,7 +1958,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1847,7 +2040,7 @@ msgstr "ျမိဳ႕အသစ္"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1855,6 +2048,7 @@ msgstr ""
 msgid "Next"
 msgstr "ေနာက္သို႔"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1883,7 +2077,7 @@ msgstr "စာကိုယ္မရွိ"
 msgid "No council"
 msgstr "ေကာင္စီမရွိ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ"
 
@@ -1901,6 +2095,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1911,6 +2107,14 @@ msgstr ""
 msgid "No further updates"
 msgstr "အသစ္မြမ္းမံမႈမ်ားမေတြ႕ပါ"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "ရလဒ္မေတြ႕ပါ"
@@ -1951,6 +2155,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2012,6 +2218,14 @@ msgstr ""
 msgid "OK"
 msgstr "အိုေက"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "အေဟာင္း၊အမည္မသိ <br>ျပႆနာမ်ား"
@@ -2028,7 +2242,7 @@ msgstr "ပို၍ေဟာင္းေသာ <br> ျပင္ျပီးျ
 msgid "Older <br>problems"
 msgstr "ပို၍ေဟာင္းေသာ<br>ျပႆနာမ်ား"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2038,7 +2252,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2082,15 +2299,15 @@ msgstr "သို႔မဟုတ္ ျပႆနာမ်ားကိုတင
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "တျခား"
 
@@ -2125,11 +2342,11 @@ msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပ
 msgid "Password:"
 msgstr "စကား၀ွက္-"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "အျမဲတမ္းလင့္ခ္"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2196,8 +2413,8 @@ msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2223,14 +2440,14 @@ msgid "Please check your email address is correct"
 msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "ပစၥည္းအမ်ိဳးအစားတစ္ခုကိုေရြးပါ"
 
@@ -2256,8 +2473,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "စာတစ္ခုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2272,13 +2489,13 @@ msgid "Please enter a password"
 msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2291,7 +2508,7 @@ msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရ
 msgid "Please enter a valid email address"
 msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
@@ -2318,14 +2535,14 @@ msgstr "သင္၏အီးေမးလ္လိပ္စာကိုရို
 msgid "Please enter your first name"
 msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2605,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2638,10 @@ msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္
 msgid "Please state whether or not the problem has been fixed"
 msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2664,15 @@ msgstr "တင္မည္"
 msgid "Posted anonymously at %s"
 msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "%s မွာ %s မွတင္ခဲ့သည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 #, fuzzy
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
@@ -2472,12 +2689,12 @@ msgstr "ယခင္က"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2520,7 +2737,7 @@ msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပိ
 msgid "Problem breakdown by state"
 msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "ျပႆနာကို ဖြင့္ထားသည္"
 
@@ -2528,7 +2745,7 @@ msgstr "ျပႆနာကို ဖြင့္ထားသည္"
 msgid "Problem state change based on survey results"
 msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ  အေျခအေန ေျပာင္းလဲသည္။"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "ျပႆနာမ်ား"
@@ -2549,13 +2766,13 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2600,7 +2817,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2636,11 +2853,11 @@ msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "%s အတြက္ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ RSS feed"
 
@@ -2648,11 +2865,11 @@ msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ R
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "%s ၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ %s ၏ RSS feed"
 
@@ -2660,13 +2877,13 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ
 msgid "RSS feed of nearby problems"
 msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
 
@@ -2685,7 +2902,7 @@ msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2703,7 +2920,7 @@ msgstr "မၾကာေသးမီက <br> ျပင္ဆင္ၿပီး"
 msgid "Recently reported problems"
 msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2742,12 +2959,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္"
@@ -2765,6 +2982,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "ျမိဳ႕အသစ္"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2776,7 +2998,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2786,7 +3008,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2800,27 +3022,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2844,11 +3066,12 @@ msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခ
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2856,10 +3079,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2868,7 +3087,12 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2880,10 +3104,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရန္"
@@ -2915,6 +3135,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2930,15 +3162,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "ဘယ္ဘက္ကို လွည့္ပါ"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2950,36 +3182,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3006,7 +3246,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3040,7 +3280,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3053,7 +3293,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3061,6 +3301,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3070,6 +3311,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3077,23 +3319,41 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "ဓာတ္ပံု"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+msgid "Show photo"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3133,7 +3393,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3164,15 +3424,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3190,12 +3456,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
@@ -3211,7 +3477,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3232,7 +3498,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3260,7 +3526,7 @@ msgstr ""
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3317,11 +3583,11 @@ msgstr "အက်ဥ္းခ်ဳပ္"
 msgid "Summary reports"
 msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3384,7 +3650,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ၿပီး ျဖစ္ေၾကာင္း ၾကားသိရ၍ ဝမ္းသာမိပါသည္။ သင့္အေနျဖင့္ ယခင္က ေကာင္စီထံ ျပႆနာတစ္ခုကို အစီရင္ခံတင္ျပဖူးပါသလား?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3398,7 +3664,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3554,7 +3820,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3628,18 +3894,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္"
 
@@ -3655,14 +3921,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးပါျပီ"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပါ"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပါ"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3710,7 +3981,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3741,8 +4012,26 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3750,7 +4039,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3775,7 +4064,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3799,6 +4089,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3855,10 +4149,10 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3902,26 +4196,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "အသံုးျပဳသူမ်ား"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3952,6 +4252,15 @@ msgstr "တည္ေနရာကို စိစစ္ျခင္း"
 msgid "Viewing a problem"
 msgstr "ျပႆနာကို စိစစ္ျခင္း"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "ေကာင္စီအဖြဲ႔မ်ား"
@@ -3971,7 +4280,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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; ၏တာဝန္ျဖစ္ေၾကာင္း သတိျပဳမိေသာ္လည္း မိမိတို႔တြင္ ၎တို႔ကို ဆက္သြယ္ရန္ အေသးစိတ္ မရွိေသးပါ။ အကယ္၍ သင့္ေတာ္သည့္ လိပ္စာရွိပါက ေက်းဇူးျပဳၿပီး ဆက္သြယ္ေပးပါ။"
 
@@ -3988,6 +4297,10 @@ msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အ
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4005,11 +4318,11 @@ msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္"
 msgid "When sent"
 msgstr "ေပးပို႔ခဲ့သည့္ အခ်ိန္"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4046,10 +4359,16 @@ msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာ
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "ခုႏွစ္"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4078,6 +4397,10 @@ msgstr "ကၽြႏု္ပ္တြင္ စကားဝွက္တစ္
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။"
@@ -4121,6 +4444,10 @@ msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င
 msgid "You declined; please fill in the box above"
 msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4184,7 +4511,7 @@ msgid "Your Reports"
 msgstr "သင္၏ အစီရင္ခံစာမ်ား"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4221,6 +4548,11 @@ msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽ
 msgid "Your name"
 msgstr "သင့္အမည္"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "သင္၏ အစီရင္ခံစာမ်ား"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4250,6 +4582,10 @@ msgstr "သင္၏ အစီရင္ခံစာမ်ား"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား"
@@ -4260,7 +4596,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4268,7 +4604,7 @@ msgstr ""
 msgid "by %s"
 msgstr "%s မွ"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
@@ -4296,49 +4632,49 @@ msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္
 msgid "from %s different users"
 msgstr "%s မွ မတူညီေသာ သုံးစြဲသူမ်ား"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "တစ္မိနစ္ခန္႔သာ"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "ျပဳျပင္ထားေသာ အခ်ိန္ဇယားကို အမွတ္အသားျပဳလုပ္ပါ"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "အတြင္းတြင္ လႊဲေျပာင္းထားသည္ကို အမွတ္အသားျပဳလုပ္ပါ"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "ပိတ္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "ဆက္လက္လုပ္ေဆာင္ေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "စံုစမ္းစစ္ေဆးေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "စီစဥ္ထားၿပီးျဖစ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
 
@@ -4349,7 +4685,7 @@ msgid "n/a"
 msgstr "မအားေသးပါ"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4384,8 +4720,8 @@ msgstr "နဂိုဝင္ေရာက္ထားမႈ: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "အျခား ဧရိယာမ်ား"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "ျပန္ဖြင့္ပါ"
 
@@ -4406,7 +4742,7 @@ msgstr "ျပည္တြင္းေကာင္စီ"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပုံကို ပင္အပ္ျဖင့္ မေဖာ္ျပထားပါ"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။"
 
@@ -4414,6 +4750,16 @@ msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။"
 msgid "today"
 msgstr "ယေန႔"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "ေျမပံု အသံုးျပဳထားၿပီး"
@@ -4431,36 +4777,54 @@ msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွ
 msgid "ward"
 msgstr "အုပ္ခ်ဳပ္ေရးဌာန"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ရက္မ်ား"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d အခ်ိန္မ်ား"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d မိနစ္မ်ား"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d မိနစ္မ်ား"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
 msgid_plural "%d supporters"
 msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d ရက္သတၱပတ္မ်ား"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4485,6 +4849,12 @@ msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား"
 
+#: templates/web/base/report/_item.html:49
+#, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] ""
+
 #: 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."
@@ -4496,3 +4866,27 @@ msgstr[0] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေ
 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] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ"
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "အစီရင္ခံစာအားလံုး"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "အစီရင္ခံစာအားလံုး"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "အမ်ိဳးအစားဖန္တီးမည္"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index f5d109f2f..ccd606051 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: pere <pere-transifex@hungry.com>, 2016\n"
 "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " og "
 
@@ -106,11 +106,11 @@ msgid ""
 "for the county council."
 msgstr "%s sender forskjellige kategorier problemer til rett administrasjon, så problemer innenfor grensene til en gitt administrasjon vil ikke alltid samsvare med problemrapporter sendt til den administrasjonen. For eksempel, en grafitti-rapport vil bli sendt til kommunen, og vil dukke opp på kommunens varsler, men vil kun vises i \"innenfor grensen\" varselet for fylket."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s bydel, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, innefor bydel %s"
 
@@ -158,7 +158,7 @@ msgstr "(løst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(ikke rapportert til administrasjonen)"
 
@@ -166,17 +166,17 @@ msgstr "(ikke rapportert til administrasjonen)"
 msgid "(optional)"
 msgstr "(valgfritt)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Velg en kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Velg en eiendomsstype --"
 
@@ -188,6 +188,14 @@ msgstr "--Velg en mal--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr "20 cm dypt hull i Eksempelveien, nær postboks"
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -196,12 +204,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 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:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Vis</label> %s <label for=\"filter_categories\">om</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -220,11 +236,11 @@ msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nei</strong>, la meg logge inn med e-post:"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong>Merk:</strong> Denne rapporten er sendt videre for å få noe til å skje.  Ingen endringer sendes videre."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -236,6 +252,8 @@ msgstr "<strong>Ja</strong>, jeg har et passord"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -278,15 +296,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Legg til bruker"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Legg til / endre problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Legg til / endre responsprioriteter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Legg til / endre responsmaler"
 
@@ -298,6 +316,10 @@ msgstr "La til %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Gjenta:"
@@ -314,6 +336,13 @@ msgstr "Varsel %d koblet ut (opprettet %s)"
 msgid "Alert me to future updates"
 msgstr "Send meg varsel ved fremtidige oppdateringer"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "alle"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -323,12 +352,14 @@ msgstr "Alle rapporter"
 msgid "All Reports as CSV"
 msgstr "Alle rapporter som CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Alle kategorier"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -363,11 +394,12 @@ msgstr "En annen bruker"
 msgid "Are you a developer?"
 msgstr "Er du en utvikler?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Er du sikker på at du vil avbryte opplastingen?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "Er du sikker?"
@@ -404,7 +436,7 @@ msgstr "Tildel til ekstern administrasjon:"
 msgid "Assign to subdivision:"
 msgstr "Tildelt underavdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr "Tilordne brukere til områder"
 
@@ -430,15 +462,23 @@ msgid "Auto-response:"
 msgstr "Auto-svar:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Tilgjengelige kategorier"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Unngå personlig informasjon og bilnummerskilt"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Avventer moderasjon"
@@ -456,7 +496,7 @@ msgid "Ban email address"
 msgstr "Bannlys epostadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -465,7 +505,7 @@ msgid "Bodies"
 msgstr "Administrasjoner"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -493,14 +533,15 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Kategorier:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -511,7 +552,7 @@ msgstr "Kategorier:"
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategori endret fra '%s' til '%s'"
 
@@ -521,6 +562,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -528,7 +570,7 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -592,10 +634,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -626,10 +672,12 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn."
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -637,11 +685,11 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn."
 msgid "Closed"
 msgstr "Lukket"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "(ikke rapportert til administrasjonen)"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "lukkede rapporter"
 
@@ -667,6 +715,11 @@ msgstr "Merkevaresamarbeidsdata:"
 msgid "Cobrand:"
 msgstr "Merkevaresamarbeid:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Brukte kart"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -730,8 +783,8 @@ msgstr "Kontakt prosjektgruppen"
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kunne ikke finne bruker"
 
@@ -749,6 +802,36 @@ msgstr "Administrasjon"
 msgid "Council contacts for %s"
 msgstr "Administrasjonskontakter for %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "markert som lukket"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "markert som fikset"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "markert som under arbeid"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "markert som undersøkes"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "markert som planlagt"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "administrasjonsreferanse:&nbsp;%s"
@@ -773,15 +856,15 @@ msgstr "Lag en rapport"
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "Opprett prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr "Opprett rapporter/oppdateringer som myndigheten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr "Opprett rapporter/oppdateringer på vegne av en bruker"
 
@@ -825,7 +908,11 @@ msgstr "Oversikt"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Behandlet av underavdeling innen 5 arbeidsdager"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -839,6 +926,11 @@ msgstr "Slett mal"
 msgid "Deleted"
 msgstr "Slettet"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -875,6 +967,12 @@ msgstr "Brukte ikke kart"
 msgid "Diligency prize league table"
 msgstr "Arbeidshester"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Lagre endringer"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "Ikke send epostvarsel på innhentede kommentarer til den som opprettet problemet"
@@ -900,23 +998,25 @@ msgstr "Liker ikke skjemaer?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Dra og slipp bilder hit eller <u>klikk for å laste opp</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplikat"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplikat"
@@ -932,8 +1032,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -947,28 +1047,28 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Rediger detaljer for administrasjon"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "Endre andre brukeres detaljer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "Endre andre brukeres rettigheter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "Endre rapportkategori"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "Endre rapportprioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "Endre rapporter"
 
@@ -1007,7 +1107,7 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Epost lagt til misbruksliste"
 
@@ -1025,7 +1125,7 @@ msgstr "Epostvarsel laget"
 msgid "Email alert deleted"
 msgstr "Epostvarsel slettet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Epost allerede i misbrukslisten"
 
@@ -1076,7 +1176,7 @@ msgstr "Endepunkt"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Skriv inn et veinavn i Z&uuml;rich"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted"
 
@@ -1110,8 +1210,8 @@ msgstr "Legg inn detaljer om problemet"
 msgid "Error"
 msgstr "Feil"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Alt"
 
@@ -1125,14 +1225,23 @@ msgid "Examples:"
 msgstr "Eksempler:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "Eksisterende kategori"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Forklar hva som er galt"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Alle rapporter som CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1141,6 +1250,7 @@ msgid "Extern"
 msgstr "Ekstern"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "Ekstern ID"
 
@@ -1161,8 +1271,8 @@ msgstr "Eksternt lag"
 msgid "Extra data:"
 msgstr "Ekstra data:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "Ekstra detaljer"
 
@@ -1187,10 +1297,12 @@ msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit bod
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1198,6 +1310,8 @@ msgstr "Løst"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Løst - Administrasjon"
 
@@ -1206,7 +1320,7 @@ msgstr "Løst - Administrasjon"
 msgid "Fixed - User"
 msgstr "Løst - Bruker"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "løste rapporter"
 
@@ -1215,7 +1329,7 @@ msgid "Fixed:"
 msgstr "Løst:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Merk som slettet"
@@ -1301,11 +1415,13 @@ msgstr "Gi meg en RSS-strøm"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Glad for å høre at det er i orden!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Søk"
@@ -1314,11 +1430,11 @@ msgstr "Søk"
 msgid "Going to send questionnaire?"
 msgstr "Skal det sendes spørreskjema?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "Gi tilgang til administratoren"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graf over problemoppretting fordelt på status over tid"
 
@@ -1334,7 +1450,7 @@ msgstr "Har dette problemet blitt løst?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1359,6 +1475,9 @@ msgstr "Hei, %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1366,6 +1485,11 @@ msgstr "Hei, %s"
 msgid "Hidden"
 msgstr "Skjul"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Send rapport på nytt"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Skjul gamle"
@@ -1374,6 +1498,10 @@ msgstr "Skjul gamle"
 msgid "Hide pins"
 msgstr "Skjul nåler"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historie"
@@ -1405,7 +1533,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1423,6 +1551,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr "Identifiser en <strong>parent</strong> hvis instansen selv er en del av en annen administrasjon."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1433,7 +1565,7 @@ msgstr "Hvis to eller flere instanser er lokalisert på samme sted,  kombinerer
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Hvis du får mer informasjon om status for problemet ditt, vær så snill å kom tilbake til nettstedet og legg igjen en oppdatering."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 "Hvis du kun ønsker at denne prioriteten skal være et valg for spesifikke kategorier, velg dem her.  Som standard vil de vises for alle kategorier."
 
@@ -1498,8 +1630,8 @@ msgstr "Ugyldig ID"
 msgid "Illegal feed selection"
 msgstr "Ugyldig valg av feed"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1517,7 +1649,9 @@ msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifi
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1535,7 +1669,7 @@ msgstr "Inkluder rapportørens personlige detaljer"
 msgid "Include unconfirmed reports"
 msgstr "Inkluder ubekreftede problemer"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Feil has_photo-verdi \"%s\""
 
@@ -1543,7 +1677,7 @@ msgstr "Feil has_photo-verdi \"%s\""
 msgid "Inspection required"
 msgstr "Trenger inspeksjon"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "Instruer underleverandør til å fikse problemer"
 
@@ -1553,33 +1687,41 @@ msgstr "Interne notater"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Interne referanser"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-verdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ugyldig slutt-dato"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgitt."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1610,6 +1752,15 @@ msgstr "Ukjent område"
 msgid "Keep me signed in on this computer"
 msgstr "Husk min innlogging på denne datamaskinen"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Siste oppdatering:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1623,11 +1774,12 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1635,6 +1787,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "La denne være blank hvis alle rapporter til denne administrasjonen skal sendes ved hjelp av samme sende-metode (dvs. \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "List alle rapporterte problemer"
@@ -1656,7 +1812,8 @@ msgstr "Lokal RSS-strøm og e-postvarsel"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokale varsler"
 
@@ -1664,15 +1821,36 @@ msgstr "Lokale varsler"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokaliser problemet på kartet over området"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "KART"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1696,7 +1874,7 @@ msgstr "Merket fikset/lukket i løpet av de siste åtte ukene"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Merket fikset/lukket mer enn åtte uker siden"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1716,7 +1894,7 @@ msgstr "Melding til ekstern administrasjon:"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Mangler jurisdiction_id"
 
@@ -1724,7 +1902,7 @@ msgstr "Mangler jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr "Moderer detaljer i rapprten"
 
@@ -1732,15 +1910,32 @@ msgstr "Moderer detaljer i rapprten"
 msgid "Moderate this report"
 msgstr "Moderer denne rapporten"
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Moderer denne rapporten"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Publisert av %s %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderert av avdeling innen en arbeidsdag"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "Moderer denne rapporten"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Måned"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "Mest kommentert"
 
@@ -1748,7 +1943,7 @@ msgstr "Mest kommentert"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1776,7 +1971,7 @@ msgstr "Navn:"
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr "Naviger til dette problemet"
 
@@ -1785,7 +1980,7 @@ msgstr "Naviger til dette problemet"
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1794,7 +1989,7 @@ msgstr "Nærmeste postnummer til nålen plassert på kartet (automatisk generert
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1878,7 +2073,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr "Ny mal"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "Nyeste"
 
@@ -1886,6 +2081,7 @@ msgstr "Nyeste"
 msgid "Next"
 msgstr "Neste"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1914,7 +2110,7 @@ msgstr "Ingen administrasjon"
 msgid "No council"
 msgstr "Ingen administrasjon"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ingen administrasjon er valgt"
 
@@ -1932,6 +2128,8 @@ msgstr "Fant ingen flaggede brukere."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1942,6 +2140,14 @@ msgstr "Kan ikke fikses"
 msgid "No further updates"
 msgstr "Ingen flere oppdateringer"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Ingen resultater returnert"
@@ -1989,6 +2195,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2050,6 +2258,14 @@ msgstr "På tide å registrere din oppdatering&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Gamle / ukjente <br>problemer"
@@ -2066,7 +2282,7 @@ msgstr "Eldre <br>løste"
 msgid "Older <br>problems"
 msgstr "Eldre <br>problemer"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "Eldste"
 
@@ -2076,7 +2292,10 @@ msgstr "Eldste"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2120,15 +2339,15 @@ msgstr "Eller problemer meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Annet"
 
@@ -2163,11 +2382,11 @@ msgstr "Passord (valgfritt)"
 msgid "Password:"
 msgstr "Passord:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "Rettigheter:"
 
@@ -2234,8 +2453,8 @@ msgstr "Plasser tegnestiften på kartet"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2261,14 +2480,14 @@ msgid "Please check your email address is correct"
 msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Velg en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Velg en type egenskap"
 
@@ -2297,8 +2516,8 @@ msgstr "Ikke vær ufin &mdash; å kjefte på din administrasjon skader verdien a
 msgid "Please enter a message"
 msgstr "Vennligst legg til en melding"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Vennligst skriv et navn"
 
@@ -2313,13 +2532,13 @@ msgid "Please enter a password"
 msgstr "Skriv inn et passord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Vennligst legg inn et emne"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2332,7 +2551,7 @@ msgstr "Legg til en gyldig e-post"
 msgid "Please enter a valid email address"
 msgstr "Legg inn din e-post"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Legg inn opplysninger om problemet"
@@ -2359,14 +2578,14 @@ msgstr "Vennligst tast inn din e-postadresse"
 msgid "Please enter your first name"
 msgstr "Vennligst tast inn ditt fornavn"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2431,7 +2650,7 @@ 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:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2464,10 +2683,10 @@ msgstr "Vennligst velg hvilken type varsel du ønsker"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Vennligst last opp kun bilder"
 
@@ -2490,15 +2709,15 @@ msgstr "Send inn"
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Lagt inn av <strong>%s</strong> %s"
 
@@ -2514,12 +2733,12 @@ msgstr "Forrige"
 msgid "Priorities"
 msgstr "Prioriteter"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Personvern"
 
@@ -2562,7 +2781,7 @@ msgstr "Problem %s sendt til administrasjon %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling av problemer"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem markert som åpent."
 
@@ -2570,7 +2789,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemer"
@@ -2591,13 +2810,13 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemer innenfor %.1fkm av denne posisjonen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemer innenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemer innenfor %s bydel"
 
@@ -2643,7 +2862,7 @@ msgstr "Offentlig oppdatering:"
 msgid "Public response:"
 msgstr "Offentlig respons:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr "Offentlig oppdatering:"
 
@@ -2679,11 +2898,11 @@ msgstr "Spørreskjema fylt inn av feilrapportøren"
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS-strøm for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-strøm for %s bydel, %s"
 
@@ -2691,11 +2910,11 @@ msgstr "RSS-strøm for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS-strøm fra %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-strøm av %s, innenfor %s bydel"
 
@@ -2703,13 +2922,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS-strøm for problemer innenfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-strøm for problemer innenfor %s bydel"
 
@@ -2728,7 +2947,7 @@ msgstr "RSS-strøm med oppdateringer for dette problemet"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2746,7 +2965,7 @@ msgstr "Nylig løste <br>problemer"
 msgid "Recently reported problems"
 msgstr "Nylig meldte problemer"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2785,12 +3004,12 @@ msgid "Report"
 msgstr "Rapport"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Rapporter et problem"
@@ -2808,6 +3027,11 @@ msgstr "Rapporter som"
 msgid "Report on %s"
 msgstr "Rapport på %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Rapporter som"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2819,7 +3043,7 @@ msgstr "Rapporter problemet ditt"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problemer"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
@@ -2829,7 +3053,7 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidligere"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
@@ -2843,27 +3067,27 @@ msgstr "Rapportert av:"
 msgid "Reported in the %s category"
 msgstr "Rapportert i kategorien %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -2887,11 +3111,12 @@ msgstr "Legger til et problem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes."
 
@@ -2899,10 +3124,6 @@ msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes."
 msgid "Reports awaiting approval"
 msgstr "Rapporter som venter på godkjenning"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2911,7 +3132,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Publiserte rapporter"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Rapporter et problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2923,10 +3149,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Send rapport på nytt"
@@ -2958,6 +3180,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr "Svarmaler for %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2973,15 +3207,15 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Roter til venstre"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2993,36 +3227,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satelitt"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "markert som duplisert rapport"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Søk i rapporter"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søk i brukere"
 
@@ -3049,7 +3291,7 @@ msgstr "Søket fant ingen brukere."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 #, fuzzy
 msgid "See user detail for reports created as the council"
 msgstr "Opprett rapporter/oppdateringer som myndigheten"
@@ -3084,7 +3326,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "Rapport sendt tilbake"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s senere"
 
@@ -3097,7 +3339,7 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Tjeneste:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3105,6 +3347,7 @@ msgstr ""
 msgid "Share"
 msgstr "Dele"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3114,6 +3357,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3121,23 +3365,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Vis gamle"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Vis mitt navn offentlig"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Vis mitt navn offentlig"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Vis gamle"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Vis gamle"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Vis nåler"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3180,7 +3444,7 @@ msgstr "Noen bilder av nylig meldte problemer"
 msgid "Some text to localize"
 msgstr "Noe tekst å oversette"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3211,15 +3475,21 @@ msgstr "Beklager, vi kunne ikke logge deg inn. Vennligst fyll in skjemaet nedenf
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Beklager, vi kunne ikke lagre bildet ditt.  Forsøk igjen."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr "Beklager, du mangler rettigheter til å gjøre dette."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3237,12 +3507,12 @@ msgstr "Start-dato:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
@@ -3258,7 +3528,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3279,7 +3549,7 @@ msgstr "Fortsatt åpen via spørreskjema, %s"
 msgid "Street View"
 msgstr "Gatevisning"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Underkategori: %s"
 
@@ -3307,7 +3577,7 @@ msgstr "Send inn"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3364,11 +3634,11 @@ msgstr "Oppsummering"
 msgid "Summary reports"
 msgstr "Oppsummeringsrapporter"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3431,7 +3701,7 @@ msgstr "Takk for at du lastet opp ditt bilde.  Vi må nå plassere ditt problem,
 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 "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?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Bildet ser ikke ut til å ha blitt lastet opp riktig (%s), prøv på nytt."
 
@@ -3445,7 +3715,7 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummeret ble ikke gjenkjent, beklager."
 
@@ -3617,7 +3887,7 @@ msgstr "Det var problemer med å vise 'Alle rapporter'-siden.  Vennligst prøv i
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3700,18 +3970,18 @@ msgstr ""
 "Denne instansen får bare rapporter for problemer som er lokalisert i <strong>area covered</strong>.\n"
 "En instans vil ikke få noen meldinger om det ikke dekker minst ett område."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Denne e-posten har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det.  Vær så snill å ignorere den hvis dere ikke er korrekt administrasjon for å håndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan legge det til i vårt system."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Denne informasjonen er påkrevd"
 
@@ -3727,14 +3997,19 @@ msgstr "Dette er en opplisting av alle problemene i denne tjenesten."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dette problemet er løst"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikke blitt løst"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dette problemet har ikke blitt løst"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3782,7 +4057,7 @@ msgid "Tips for perfect photos"
 msgstr "Tips for perfekte bilder"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3813,8 +4088,26 @@ msgstr "For å se et kart med en mer presis plassering for dette problemet."
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "markert som fikset"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3822,7 +4115,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3847,7 +4140,8 @@ msgstr "Forsøk å sende epost direkte til oss:"
 msgid "Unconfirmed"
 msgstr "Ubekreftet"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "uløste rapporter"
 
@@ -3871,6 +4165,10 @@ msgstr "Ukjent feil"
 msgid "Unknown problem ID"
 msgstr "Ukjent problem-Id"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3927,10 +4225,10 @@ msgstr "Oppdater tilstanden"
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3974,26 +4272,32 @@ msgstr "Brukte kart"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Brukerflagg fjernet"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Bruker flagget"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "markert som fikset"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. "
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brukere"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4024,6 +4328,15 @@ msgstr "Ser på et sted"
 msgid "Viewing a problem"
 msgstr "Ser på et problem"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Bydeler innenfor denne administrasjonen"
@@ -4043,7 +4356,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr "Vi behøver din epost-adresse, vennligst oppgi den nedenfor."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, så ta kontakt med oss."
 
@@ -4060,6 +4373,10 @@ msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til våre <a hr
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Det gjør oss triste å høre at problemet ikke er løst.  Hva med å forsøke å skrive til dine lokale representanter?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Vi tar kontakt med deg så snart vi kan."
@@ -4077,11 +4394,11 @@ msgstr "Når redigert"
 msgid "When sent"
 msgstr "Når sendt"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Oj oj, brems ned! Tre bilder er nok."
 
@@ -4116,10 +4433,16 @@ msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig
 msgid "Wrong location? Just click again on the map."
 msgstr "Feil sted?  Bare klikk på nytt i kartet."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "År"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4148,6 +4471,10 @@ msgstr "Ja, jeg har et passord"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du klager over at denne problemrapporten ble moderert uten grunn:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:"
@@ -4193,6 +4520,10 @@ msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den ska
 msgid "You declined; please fill in the box above"
 msgstr "Du avviste; vennligst fyll inn boksen ovenfor"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4253,7 +4584,7 @@ msgid "Your Reports"
 msgstr "Dine rapporter"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Din konto"
 
@@ -4290,6 +4621,11 @@ msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a hre
 msgid "Your name"
 msgstr "Ditt navn"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Dine oppdateringer"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4319,6 +4655,10 @@ msgstr "Dine oppdateringer"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Dine oppdateringer"
@@ -4329,7 +4669,7 @@ msgid "Yourself"
 msgstr "Deg"
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "alle"
 
@@ -4337,7 +4677,7 @@ msgstr "alle"
 msgid "by %s"
 msgstr "av %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "markert som duplisert rapport"
 
@@ -4365,49 +4705,49 @@ msgstr "rediger bruker"
 msgid "from %s different users"
 msgstr "fra %s forskjellige brukere"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "sist oppdatert %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "mindre enn et minutt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "markert som planlagt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "markert som en intern henvisning"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "markert som lukket"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "markert som fikset"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "markert som under arbeid"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "markert som undersøkes"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "markert som uløselig"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "markert som ikke administrasjonens ansvar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "markert som planlagt"
 
@@ -4418,7 +4758,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr "ingen"
 
@@ -4453,8 +4793,8 @@ msgstr "opprinnelig lagt inn: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andre områder:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "åpnet på nytt"
 
@@ -4475,7 +4815,7 @@ msgstr "den lokale administrasjonen"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "denne type lokalt problem"
 
@@ -4483,6 +4823,16 @@ msgstr "denne type lokalt problem"
 msgid "today"
 msgstr "idag"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Oppdatering"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Oppdateringer"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "brukte kart"
@@ -4500,27 +4850,41 @@ msgstr "bruker er eier av problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "Epostadresse"
+msgstr[1] "Epostadresse"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dager"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutter"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minutt"
+msgstr[1] "%d minutter"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4528,13 +4892,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d støttespiller"
 msgstr[1] "%d støttespillere"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d uke"
 msgstr[1] "%d uker"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4563,6 +4934,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> rapport-<br>oppdatering"
 msgstr[1] "<big>%s</big> rapport-<br>oppdateringer"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Publisert av %s %s"
+msgstr[1] "Publisert av %s %s"
+
 #: 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."
@@ -4577,5 +4955,43 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet."
 msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet."
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "sist oppdatert %s"
+msgstr[1] "sist oppdatert %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Rapport"
+msgstr[1] "Rapport"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle kategorier"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Ekstern ID"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "Trenger inspeksjon"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Endre rapportkategori"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Publisert av %s %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "sist oppdatert %s"
+
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index a7b89ee99..6426d2076 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jos Helmich <jos@valaquanta.fi>, 2016\n"
 "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "en"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s district, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, in %s district"
 
@@ -154,7 +154,7 @@ msgstr "(opgelost)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) "
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(niet verstuurd naar de gemeente)"
 
@@ -162,17 +162,17 @@ msgstr "(niet verstuurd naar de gemeente)"
 msgid "(optional)"
 msgstr "(optioneel)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(verstuurd naar beide)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Kies een categorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Kies een woning type --"
 
@@ -184,6 +184,14 @@ msgstr "--Kies een website indeling--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr "Een 25 cm diep gat op voorbeeldstraat bij de brievenbus"
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).<br>\n"
 "Misschien moeten er <code>MAPIT_TYPES</code> toegevoegd worden aan het configuratie bestand?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nee</strong> Laat me inloggen per e-mail"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 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."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 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."
 
@@ -235,6 +251,8 @@ msgstr "<strong>Ja</strong, ik heb een wachtwoord"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -279,15 +297,15 @@ msgstr "Voeg aan favorieten toe"
 msgid "Add user"
 msgstr "Gebruiker toevoegen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Voeg toe/wijzig categoriën"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Voeg toe/wijzig beantwoordingsprioriteiten"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Voeg toe/wijzig antwoordstramien"
 
@@ -299,6 +317,10 @@ msgstr "%s toegevoegd"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s zijn favorieten."
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Nogmaals:"
@@ -315,6 +337,12 @@ msgstr "Melding %d inactief gemaakt (gemaakt %s)"
 msgid "Alert me to future updates"
 msgstr "Meld het me als er updates zijn"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -324,12 +352,14 @@ msgstr "Alle meldingen"
 msgid "All Reports as CSV"
 msgstr "Alle rapporten als CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Alle categoriën"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -364,11 +394,12 @@ msgstr "Andere gebruiker"
 msgid "Are you a developer?"
 msgstr "Ben je een ontwikkelaar?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Weet je zeker dat je de bestandsoverdracht wil afbreken?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "Weet je het zeker?"
@@ -405,7 +436,7 @@ msgstr "Toegewezen aan:"
 msgid "Assign to subdivision:"
 msgstr "Toegewezen aan afdeling:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -431,15 +462,23 @@ msgid "Auto-response:"
 msgstr "Automatisch antwoord:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Beschikbare categoriën"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 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:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Wacht op controle"
@@ -457,7 +496,7 @@ msgid "Ban email address"
 msgstr "Verban e-mailadres"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -466,7 +505,7 @@ msgid "Bodies"
 msgstr "Openbare lichamen"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -494,14 +533,15 @@ msgid "Categories"
 msgstr "Categoriën"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Categoriën:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -512,7 +552,7 @@ msgstr "Categoriën:"
 msgid "Category"
 msgstr "Categorie"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Categorie veranderd van '%s' in '%s'"
 
@@ -522,6 +562,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -529,7 +570,7 @@ msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud"
 msgid "Category:"
 msgstr "Categorie:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categorie: %s"
 
@@ -588,10 +629,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -622,10 +667,12 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen."
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -633,11 +680,11 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen."
 msgid "Closed"
 msgstr "Gesloten"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Gesloten door gemeente"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "Gesloten meldingen"
 
@@ -663,6 +710,11 @@ msgstr "Cobrand data:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Gebruikte kaart"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -726,8 +778,8 @@ msgstr "Neem contact op met het team"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kan de gebruiker niet vinden"
 
@@ -745,6 +797,36 @@ msgstr "Gemeente"
 msgid "Council contacts for %s"
 msgstr "Gemeente contactpersongen voor %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "gemarkeerd als gesloten"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "gemarkeerd als opgelost"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "gemarkeerd als in behandeling"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "gemarkeerd als in onderzoek"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "gemarkeerd als gepland"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "gemeente ref.: %s"
@@ -769,15 +851,15 @@ msgstr "Maak een melding"
 msgid "Create category"
 msgstr "Maak een categorie"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -821,7 +903,11 @@ msgstr "Dashboard"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Door een afdeling behandeld binnen 5 werkdagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -835,6 +921,11 @@ msgstr "Verwijder sjabloon"
 msgid "Deleted"
 msgstr "Verwijderd"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -871,6 +962,12 @@ msgstr "Kaart niet gebruikt"
 msgid "Diligency prize league table"
 msgstr "Toewijdingsranglijst"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Wijzigingen opslaan"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "Zend bij eventueel commentaar geen email waarschuwingen naar degene die probleem aanmaakte"
@@ -896,23 +993,25 @@ msgstr "Hou je niet van formulieren?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Plaats de fotos hier om ze te <u>verzenden</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dubbeling"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Dubbeling"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Dubbeling"
@@ -925,8 +1024,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr "Oostwaarde/Noordwaarde"
 
@@ -940,28 +1039,28 @@ msgid "Edit"
 msgstr "Bewerk"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Wijzig openbaar lichaam details"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1000,7 +1099,7 @@ msgstr "Redacteur"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email toegevoegd aan zwarte lijst"
 
@@ -1018,7 +1117,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Email staat al op zwarte lijst"
 
@@ -1063,7 +1162,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in"
 
@@ -1097,8 +1196,8 @@ msgstr "Geef details van het probleem"
 msgid "Error"
 msgstr "Foutmelding"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1112,14 +1211,23 @@ msgid "Examples:"
 msgstr "Voorbeelden:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Alle rapporten als CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1128,6 +1236,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1148,8 +1257,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Extra info:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1174,10 +1283,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1185,6 +1296,8 @@ msgstr "Opgelost"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Opgelost - Gemeente"
 
@@ -1193,7 +1306,7 @@ msgstr "Opgelost - Gemeente"
 msgid "Fixed - User"
 msgstr "Opgelost - Gebruiker"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1202,7 +1315,7 @@ msgid "Fixed:"
 msgstr "Opgelost:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1288,11 +1401,13 @@ msgstr "Geef me een RSS feed"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Gaan"
@@ -1301,11 +1416,11 @@ msgstr "Gaan"
 msgid "Going to send questionnaire?"
 msgstr "Vragenlijst versturen?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Grafiek van problemen aangemaakt per status na verloop van tijd"
 
@@ -1321,7 +1436,7 @@ msgstr "Is dit probleem opgelost?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jouw eerste keer?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1346,6 +1461,9 @@ msgstr "Hoi %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1353,6 +1471,11 @@ msgstr "Hoi %s"
 msgid "Hidden"
 msgstr "Verborgen"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Herstuur melding"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Verberg oud"
@@ -1361,6 +1484,10 @@ msgstr "Verberg oud"
 msgid "Hide pins"
 msgstr "Verberg spelden"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Geschiedenis"
@@ -1392,7 +1519,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1410,6 +1537,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1420,7 +1551,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1478,8 +1609,8 @@ msgstr "Illegaal ID"
 msgid "Illegal feed selection"
 msgstr "Illegale RSS feed selectie"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1497,7 +1628,9 @@ msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1515,7 +1648,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Ongeverifiëerde meldingen meesturen"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Ongeldige has_photo waarde \"%s\""
 
@@ -1523,7 +1656,7 @@ msgstr "Ongeldige has_photo waarde \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1533,33 +1666,41 @@ msgstr "Interne notities"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Ongeldige agency_responsible waarde %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ongeldige einddatum"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Ongeldig formaat %s gespecifieerd"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ongeldige startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1590,6 +1731,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Hou me ingelogd op deze computer"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Laatste update:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1603,11 +1753,12 @@ msgstr "Laatste update:"
 msgid "Last&nbsp;update:"
 msgstr "Laatste update:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1766,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Toon alle meldingen"
@@ -1636,7 +1791,8 @@ msgstr "Lokale RSS feeds en e-mail meldingen"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokale RSS feeds en e-mail meldingen voor '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokale melding"
 
@@ -1644,15 +1800,36 @@ msgstr "Lokale melding"
 msgid "Locate the problem on a map of the area"
 msgstr "Vind het probleem op de kaart van de omgeving"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "Kaart"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1676,7 +1853,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1696,7 +1873,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Vermiste jurisdiction_id"
 
@@ -1704,7 +1881,7 @@ msgstr "Vermiste jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1712,15 +1889,31 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Gemeld door %s bij %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Gemeld door %s bij %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Maand"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1728,7 +1921,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1756,7 +1949,7 @@ msgstr "Naam:"
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1765,7 +1958,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1774,7 +1967,7 @@ msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenere
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1858,7 +2051,7 @@ msgstr "Nieuwe status"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1866,6 +2059,7 @@ msgstr ""
 msgid "Next"
 msgstr "Volgende"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1894,7 +2088,7 @@ msgstr ""
 msgid "No council"
 msgstr "Geen gemeente"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Geen gemeente geselecteerd"
 
@@ -1912,6 +2106,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1922,6 +2118,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1962,6 +2166,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2023,6 +2229,14 @@ msgstr "Nu om je update te verzend&hellip;"
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Oude / onbekende <br>problemen"
@@ -2039,7 +2253,7 @@ msgstr "Ouder<br>opgelost"
 msgid "Older <br>problems"
 msgstr "Oudere<br>problemen"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2049,7 +2263,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2093,15 +2310,15 @@ msgstr "Of problemen gemeld aan:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Anders"
 
@@ -2136,11 +2353,11 @@ msgstr "Wachtwoord (optioneel)"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2207,8 +2424,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2234,14 +2451,14 @@ msgid "Please check your email address is correct"
 msgstr "Controleer of je e-mailadres klopt"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Kies een categorie"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Kies een pand type"
 
@@ -2267,8 +2484,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Geef bericht in"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2283,13 +2500,13 @@ msgid "Please enter a password"
 msgstr "Geef wachtwoord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Geef onderwerp"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2302,7 +2519,7 @@ msgstr "Geef een geldig e-mailadres"
 msgid "Please enter a valid email address"
 msgstr "Geef een geldig e-mailadres"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Geef details"
@@ -2329,14 +2546,14 @@ msgstr "Geef een geldig e-mailadres"
 msgid "Please enter your first name"
 msgstr "Geef je voornaam"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2399,7 +2616,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Let op:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2432,10 +2649,10 @@ msgstr "Kies de melding die je wilt"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Geef aan of het probleem is verholpen"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2458,15 +2675,15 @@ msgstr "Bericht"
 msgid "Posted anonymously at %s"
 msgstr "Anoniem geplaatst bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Geplaatst door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Geplaatst door <strong>%s</strong> (%s) bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Geplaatst door <strong>%s</strong> bij %s"
 
@@ -2482,12 +2699,12 @@ msgstr "Vorige"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2530,7 +2747,7 @@ msgstr "Probleem %s verzonden naar gemeente %s"
 msgid "Problem breakdown by state"
 msgstr "Probleem verdeeld per status"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Probleem gemarkeerd als open"
 
@@ -2538,7 +2755,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemen"
@@ -2559,13 +2776,13 @@ msgstr "Recent gemelde problemen op FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemen binnen een straal van %.1fkm van deze lokatie"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemen binnen %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemen binnen wijk %s"
 
@@ -2610,7 +2827,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2646,11 +2863,11 @@ msgstr "Vragenlijst ingevuld door melder"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS feed voor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed voor wijk %s, %s"
 
@@ -2658,11 +2875,11 @@ msgstr "RSS feed voor wijk %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS feed van %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed van %s, binnen wijk %s"
 
@@ -2670,13 +2887,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed van problemen binnen %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed van problemen in wijk %s"
 
@@ -2695,7 +2912,7 @@ msgstr "RSS feed van updates voor dit probleem"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2713,7 +2930,7 @@ msgstr "Recent <br>opgelost"
 msgid "Recently reported problems"
 msgstr "Recent gemelde problemen"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2752,12 +2969,12 @@ msgid "Report"
 msgstr "Melding"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Meld een probleem"
@@ -2775,6 +2992,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Meld op %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Gemeld:"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2786,7 +3008,7 @@ msgstr "Probleem melden"
 msgid "Report, view, or discuss local problems"
 msgstr "Meld, bekijk of discussier over lokale problemen"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Anoniem gemeld bij %s"
@@ -2796,7 +3018,7 @@ msgstr "Anoniem gemeld bij %s"
 msgid "Reported before"
 msgstr "Eerder gemeld"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Gemeld door %s bij %s"
@@ -2810,27 +3032,27 @@ msgstr "Gemeld door:"
 msgid "Reported in the %s category"
 msgstr "Toegewezen aan categorie %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anoniem gemeld in de categorie %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Anoniem door %s gemeld bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Gemeld door %s door %s bij %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Gemeld door %s in de  categorie %s door %s bij %s"
 
@@ -2854,11 +3076,12 @@ msgstr "Meld een probleem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Meldingen"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2866,10 +3089,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2878,7 +3097,12 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Meld een probleem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2890,10 +3114,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Herstuur melding"
@@ -2925,6 +3145,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2940,15 +3172,15 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Linksom roteren"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2960,35 +3192,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Wijzigingen opslaan"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Zoek Meldingen"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Zoek Gebruikers"
 
@@ -3015,7 +3255,7 @@ msgstr "Geen gebruikers gevonden."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3049,7 +3289,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Verzonden aan %s %s later"
 
@@ -3062,7 +3302,7 @@ msgstr "Verzonden:"
 msgid "Service:"
 msgstr "Service:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3070,6 +3310,7 @@ msgstr ""
 msgid "Share"
 msgstr "Deel"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3079,6 +3320,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3086,23 +3328,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Toon oud"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Toon mijn naam publiekelijk"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Toon mijn naam publiekelijk"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Toon oud"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Toon oud"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Toon spelden"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3142,7 +3404,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3173,15 +3435,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3199,12 +3467,12 @@ msgstr "Startdatum:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Staat"
@@ -3220,7 +3488,7 @@ msgstr "Staat:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3241,7 +3509,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Subcategorie: %s"
 
@@ -3269,7 +3537,7 @@ msgstr "Opslaan"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3326,11 +3594,11 @@ msgstr "Samenvatting"
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3393,7 +3661,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3407,7 +3675,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "De postcode is niet geldig."
 
@@ -3563,7 +3831,7 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3637,18 +3905,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie omdat de gebruiker geen categorie heeft aangegeven. Negeer deze melding als je niet de juiste contactpersoon bent, of laat ons weten in welke categorie dit probleem valt zodat we dit kunnen toevoegen aan ons systeem."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Deze informatie is verplicht"
 
@@ -3664,14 +3932,19 @@ msgstr "Dit is een samenvatting van alle meldingen op deze site."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dit probleem is opgelost"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dit probleem is niet opgelost"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dit probleem is niet opgelost"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3719,7 +3992,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3750,8 +4023,26 @@ msgstr ""
 msgid "Total"
 msgstr "Totaal"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "gemarkeerd als opgelost"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3759,7 +4050,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3784,7 +4075,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "Onopgeloste meldingen"
 
@@ -3808,6 +4100,11 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Voeg aan favorieten toe"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3864,10 +4161,10 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3911,26 +4208,32 @@ msgstr "Gebruikte kaart"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "gemarkeerd als opgelost"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3961,6 +4264,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3980,7 +4292,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3997,6 +4309,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4014,11 +4330,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4053,10 +4369,16 @@ msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Jaar"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4085,6 +4407,10 @@ msgstr "Ja, ik heb een wachtwoord"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:"
@@ -4128,6 +4454,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4186,7 +4516,7 @@ msgid "Your Reports"
 msgstr "Jouw meldingen"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4223,6 +4553,11 @@ msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/pri
 msgid "Your name"
 msgstr "Jouw naam"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Jouw meldingen"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4252,6 +4587,10 @@ msgstr "Jouw meldingen"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Jouw updates"
@@ -4262,7 +4601,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4270,7 +4609,7 @@ msgstr ""
 msgid "by %s"
 msgstr "door %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4298,49 +4637,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr "door %s verschillende gebruikers"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "minder dan een minuut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "gemarkeerd als gesloten"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "gemarkeerd als opgelost"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "gemarkeerd als in behandeling"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "gemarkeerd als in onderzoek"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "gemarkeerd als gepland"
 
@@ -4351,7 +4690,7 @@ msgid "n/a"
 msgstr "n/b"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4386,8 +4725,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -4408,7 +4747,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4416,6 +4755,16 @@ msgstr ""
 msgid "today"
 msgstr "vandaag"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Updates ontvangen"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Updates ontvangen"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4433,27 +4782,41 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uur"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuut"
+msgstr[1] "%d minuten"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4461,13 +4824,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d voorstander"
 msgstr[1] "%d voorstanders"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4496,6 +4866,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Gemeld door %s bij %s"
+msgstr[1] "Gemeld door %s bij %s"
+
 #: 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."
@@ -4510,5 +4887,31 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/base/report/_item.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Melding"
+msgstr[1] "Melding"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle categoriën"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Maak een categorie"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Gemeld door %s bij %s"
+
 #~ msgid "Cancel"
 #~ msgstr "Annuleren"
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index a33ea6c42..99eea0af6 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " og "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s bydel, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, innanfor bydelen %s"
 
@@ -154,7 +154,7 @@ msgstr "(løyst)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(ikkje rapportert til administrasjonen)"
 
@@ -162,17 +162,17 @@ msgstr "(ikkje rapportert til administrasjonen)"
 msgid "(optional)"
 msgstr "(valfritt)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(sendt til begge)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Vel ein kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Vel ein eigedomstype --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong>Ja</strong>, eg har eit passord"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "La til %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Gjenta:"
@@ -310,6 +332,12 @@ msgstr "Varsel %d kobla ut (oppretta %s)"
 msgid "Alert me to future updates"
 msgstr "Send meg varsel ved framtidige oppdateringar"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr ""
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "Bannlys e-postadresse"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Lukka"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "(ikkje rapportert til administrasjonen)"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,11 @@ msgstr "Data om merkevaresamarbeid:"
 msgid "Cobrand:"
 msgstr "Merkevaresamarbeid:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "brukte kart"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr "Kontakt prosjektgruppa"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kunne ikkje finna brukaren"
 
@@ -736,6 +788,33 @@ msgstr "Administrasjon"
 msgid "Council contacts for %s"
 msgstr "Administrasjonskontaktar for %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "Denne rapporten er for tida markert som lukka."
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "markert som løyst"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +839,15 @@ msgstr "Lag ein rapport"
 msgid "Create category"
 msgstr "Lag kategori"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +891,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +909,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Sletta"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +950,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Arbeidshestar"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Lagra endringar"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,22 +981,24 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 msgid "Duplicates"
 msgstr ""
 
@@ -914,8 +1010,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -929,28 +1025,28 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -989,7 +1085,7 @@ msgstr "Oppdatert av"
 msgid "Email"
 msgstr "E-post"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "E-post lagd til misbrukliste"
 
@@ -1007,7 +1103,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-post allereie i misbruklista"
 
@@ -1052,7 +1148,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1086,8 +1182,8 @@ msgstr "Legg inn detaljar om problemet"
 msgid "Error"
 msgstr "Feil"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1101,14 +1197,22 @@ msgid "Examples:"
 msgstr "Døme:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1117,6 +1221,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1137,8 +1242,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1163,10 +1268,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1174,6 +1281,8 @@ msgstr "Løyst"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Løyst – Administrasjon"
 
@@ -1182,7 +1291,7 @@ msgstr "Løyst – Administrasjon"
 msgid "Fixed - User"
 msgstr "Løyst – Brukar"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1191,7 +1300,7 @@ msgid "Fixed:"
 msgstr "Løyst:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1277,11 +1386,13 @@ msgstr "Gje meg ein RSS-straum"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Hald fram"
@@ -1290,11 +1401,11 @@ msgstr "Hald fram"
 msgid "Going to send questionnaire?"
 msgstr "Skal spørjeskjemaet sendast?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Graf over problemoppretting fordelt på status over tid"
 
@@ -1310,7 +1421,7 @@ msgstr "Har dette problemet vorte løyst?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1335,6 +1446,9 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1342,6 +1456,11 @@ msgstr ""
 msgid "Hidden"
 msgstr "Skjult"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Send rapport på nytt"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr ""
@@ -1350,6 +1469,10 @@ msgstr ""
 msgid "Hide pins"
 msgstr "Skjul nåler"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historie"
@@ -1381,7 +1504,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1399,6 +1522,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1409,7 +1536,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1467,8 +1594,8 @@ msgstr "Ugyldig ID"
 msgid "Illegal feed selection"
 msgstr "Ugyldig val av straum"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1486,7 +1613,9 @@ msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifi
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1504,7 +1633,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr "Inkluder ikkje-stadfesta problem"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Feil has_photo-verdi «%s»"
 
@@ -1512,7 +1641,7 @@ msgstr "Feil has_photo-verdi «%s»"
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1522,33 +1651,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Ugyldig agency_responsible-verdi %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Ugyldig slutt-dato"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Ugyldig format %s oppgjeve."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Ugyldig startdato"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1579,6 +1716,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Hugs mi innlogging på denne datamaskina"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Siste oppdatering:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1592,11 +1738,12 @@ msgstr "Siste oppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Siste&nbsp;oppdatering:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1604,6 +1751,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Vis alle rapporterte problem"
@@ -1625,7 +1776,8 @@ msgstr "Lokal RSS-straum og e-postvarsel"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokal RSS-straum og e-postvarsel for «%s»"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokale varsel"
 
@@ -1633,15 +1785,36 @@ msgstr "Lokale varsel"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokaliser problemet på kartet over området"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1665,7 +1838,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1685,7 +1858,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Manglar jurisdiction_id"
 
@@ -1693,7 +1866,7 @@ msgstr "Manglar jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1701,15 +1874,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Publisert av %s %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Publisert av %s %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "andre område:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1717,7 +1907,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1745,7 +1935,7 @@ msgstr "Namn:"
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1754,7 +1944,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1763,7 +1953,7 @@ msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert)
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1845,7 +2035,7 @@ msgstr "Ny tilstand"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1853,6 +2043,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1881,7 +2072,7 @@ msgstr ""
 msgid "No council"
 msgstr "Ingen administrasjon"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ingen administrasjon er vald"
 
@@ -1899,6 +2090,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1909,6 +2102,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1949,6 +2150,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2010,6 +2213,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -2026,7 +2237,7 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2036,7 +2247,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2080,15 +2294,15 @@ msgstr "Eller problem meldt til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Anna"
 
@@ -2123,11 +2337,11 @@ msgstr ""
 msgid "Password:"
 msgstr "Passord:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2194,8 +2408,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2221,14 +2435,14 @@ 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.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Vel ein kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Vel ein type eigenskap"
 
@@ -2254,8 +2468,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Ver venleg og skriv ei melding"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2270,13 +2484,13 @@ msgid "Please enter a password"
 msgstr "Skriv inn eit passord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Ver venleg og legg inn eit emne"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2289,7 +2503,7 @@ 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/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Ver venleg og legg inn opplysningar om problemet"
@@ -2316,14 +2530,14 @@ msgstr ""
 msgid "Please enter your first name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2388,7 +2602,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Merk:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2421,10 +2635,10 @@ msgstr "Ver venleg og vel kva for ein type varsel du ynskjer"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2447,15 +2661,15 @@ msgstr "Send inn"
 msgid "Posted anonymously at %s"
 msgstr "Publisert anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Sendt inn av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Lagt inn av <strong>%s</strong> %s"
 
@@ -2471,12 +2685,12 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2519,7 +2733,7 @@ msgstr "Problem %s sendt til administrasjon %s"
 msgid "Problem breakdown by state"
 msgstr "Tilstandsfordeling av problem"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem markert som ope."
 
@@ -2527,7 +2741,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problem"
@@ -2548,13 +2762,13 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problem innanfor %.1fkm av denne posisjonen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problem innanfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problem innanfor %s bydel"
 
@@ -2599,7 +2813,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2635,11 +2849,11 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren"
 msgid "RSS feed"
 msgstr "RSS-straum"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS-straum for %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-straum for %s bydel, %s"
 
@@ -2647,11 +2861,11 @@ msgstr "RSS-straum for %s bydel, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS-straum frå %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-straum av %s, innanfor %s bydel"
 
@@ -2659,13 +2873,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS-straum for problem innanfor %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-straum for problem innanfor %s bydel"
 
@@ -2684,7 +2898,7 @@ msgstr "RSS-straum med oppdateringar for dette problemet"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2702,7 +2916,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr "Nyleg melde problem"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2741,12 +2955,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Rapporter eit problem"
@@ -2764,6 +2978,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Rapport på %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Rapport på %s"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2775,7 +2994,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Rapporter, finn eller diskuter lokale problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapportert anonymt %s"
@@ -2785,7 +3004,7 @@ msgstr "Rapportert anonymt %s"
 msgid "Reported before"
 msgstr "Rapportert tidlegare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Publisert av %s %s"
@@ -2799,27 +3018,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapportert i kategorien %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Publisert av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Rapportert av %s av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapportert av %s i kategorien %s av %s %s"
 
@@ -2843,11 +3062,12 @@ msgstr "Legger til eit problem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2855,10 +3075,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2867,7 +3083,12 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Rapporter eit problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2879,10 +3100,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Send rapport på nytt"
@@ -2914,6 +3131,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2929,15 +3158,15 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2949,35 +3178,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Lagra endringar"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Søk i rapportar"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Søk i brukarar"
 
@@ -3004,7 +3241,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3038,7 +3275,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Sendt til %s %s seinare"
 
@@ -3051,7 +3288,7 @@ msgstr "Sendt:"
 msgid "Service:"
 msgstr "Teneste:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3059,6 +3296,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3068,6 +3306,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3075,23 +3314,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Vis nåler"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Vis namnet mitt offentleg"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Vis namnet mitt offentleg"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Vis nåler"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Vis nåler"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3131,7 +3390,7 @@ msgstr "Nokre bilete av nyleg melde problem"
 msgid "Some text to localize"
 msgstr "Noko tekst å omsetja"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3162,15 +3421,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3188,12 +3453,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Tilstand"
@@ -3209,7 +3474,7 @@ msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3230,7 +3495,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3258,7 +3523,7 @@ msgstr "Send inn"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3315,11 +3580,11 @@ msgstr "Oppsummering"
 msgid "Summary reports"
 msgstr "Oppsummeringsrapportar"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3385,7 +3650,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 "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?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt."
 
@@ -3399,7 +3664,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummeret vart ikkje gjenkjent, orsak."
 
@@ -3555,7 +3820,7 @@ msgstr "Det oppstod problem med å visa «Alle rapportar»-sida.  Ver venleg og
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3629,18 +3894,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det.  Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Denne informasjonen er påkravd"
 
@@ -3656,14 +3921,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Dette problemet er løyst"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Dette problemet har ikkje vorte løyst"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Dette problemet har ikkje vorte løyst"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3711,7 +3981,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3742,8 +4012,26 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "markert som løyst"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3751,7 +4039,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3776,7 +4064,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Ikkje stadfesta"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3800,6 +4089,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr "Ukjend problem-ID"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3856,10 +4149,10 @@ msgstr "Oppdater tilstanden"
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3903,26 +4196,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Brukarflagg fjerna"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Brukar flagga"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "markert som løyst"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Brukarar"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3953,6 +4252,15 @@ msgstr "Ser på ein stad"
 msgid "Viewing a problem"
 msgstr "Ser på eit problem"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Bydelar innanfor denne administrasjonen"
@@ -3972,7 +4280,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss."
 
@@ -3989,6 +4297,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4006,11 +4318,11 @@ msgstr "Når redigert"
 msgid "When sent"
 msgstr "Når sendt"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4045,10 +4357,16 @@ msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "År"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4077,6 +4395,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:"
@@ -4120,6 +4442,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4178,7 +4504,7 @@ msgid "Your Reports"
 msgstr "Rapportane dine"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4215,6 +4541,11 @@ msgstr ""
 msgid "Your name"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Oppdateringane dine"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4244,6 +4575,10 @@ msgstr "Oppdateringane dine"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Oppdateringane dine"
@@ -4254,7 +4589,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4262,7 +4597,7 @@ msgstr ""
 msgid "by %s"
 msgstr "av %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4290,49 +4625,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr "frå %s ulike brukarar"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "mindre enn eitt minutt"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "markert som løyst"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4343,7 +4678,7 @@ msgid "n/a"
 msgstr "i/t"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4378,8 +4713,8 @@ msgstr ""
 msgid "other areas:"
 msgstr "andre område:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "opna på nytt"
 
@@ -4400,7 +4735,7 @@ msgstr "den lokale administrasjonen"
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "denne typen lokalt problem"
 
@@ -4408,6 +4743,16 @@ msgstr "denne typen lokalt problem"
 msgid "today"
 msgstr "i dag"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Oppdateringar"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Oppdateringar"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "brukte kart"
@@ -4425,27 +4770,41 @@ msgstr "brukaren er eigaren av problemet"
 msgid "ward"
 msgstr "bydel"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "Månad"
+msgstr[1] "Månad"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4453,13 +4812,20 @@ msgid_plural "%d supporters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4488,6 +4854,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> rapportoppdatering"
 msgstr[1] "<big>%s</big> rapportoppdateringar"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Publisert av %s %s"
+msgstr[1] "Publisert av %s %s"
+
 #: 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."
@@ -4501,3 +4874,29 @@ 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] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden."
 msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden."
+
+#: templates/web/base/report/_item.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Alle rapportar"
+msgstr[1] "Alle rapportar"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Alle rapportar"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Lag kategori"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Publisert av %s %s"
diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
index f1ccc9a6e..5335abd68 100644
--- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "e"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s ala, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, %s dentro da ala"
 
@@ -154,7 +154,7 @@ msgstr "(Corrigido)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(Como ruas e pavimentos esburacados, grafitis, árvores caídas, lajes partidas, entulhos, lixo, sinais transito, vandalismo, postes caídos, vazamentos de agua e esgotos, iluminação pública ou qualquer outro problema)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(Não reportar ao município)"
 
@@ -162,17 +162,17 @@ msgstr "(Não reportar ao município)"
 msgid "(optional)"
 msgstr "(opcional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(remeter para ambos)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Escolha uma categoria --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Escolha um tipo de categoria --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Mostrar</label> %s <label for=\"filter_categories\">sobre</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr "<strong> Não </strong> Deixe-me confirmar a minha atualização por e-m
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong> Não </strong>, deixe-me entrar por e-mail"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr "<strong> Sim </strong> Eu tenho uma password"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Adicionar user"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr "Adicionado %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Novamente"
@@ -310,6 +332,12 @@ msgstr "Alerta %d desativada (criado %s)"
 msgid "Alert me to future updates"
 msgstr "Avise-me de atualizações futuras"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr "Todos os Relatórios"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Você é um desenvolvedor?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr "Atribuir ao órgão externo:"
 msgid "Assign to subdivision:"
 msgstr "Atribuir a subdivisão:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Aguardando moderação"
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr "Ban endereço de e-mail"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr "Corpos"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr "Categoria"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes"
 msgid "Category:"
 msgstr "Categoria:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Categoria: %s"
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr "Clique no link do email de confirmação para entrar"
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr "Clique no link do email de confirmação para entrar"
 msgid "Closed"
 msgstr "Fechado"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Fechado pelo Município"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "relatórios fechados"
 
@@ -654,6 +701,11 @@ msgstr "Cobrand data:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "mapa usado"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +769,8 @@ msgstr "Fale com a equipe"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Não foi possível encontrar usuário"
 
@@ -736,6 +788,33 @@ msgstr "Concelho"
 msgid "Council contacts for %s"
 msgstr "Contactos do município para %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "marcados como fechados"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "marcado como fixo"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+msgid "Council has marked as in progress"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+msgid "Council has marked as investigating"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+msgid "Council has marked as planned"
+msgstr ""
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +839,15 @@ msgstr "Criar um report"
 msgid "Create category"
 msgstr "Criar uma categoria"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +891,11 @@ msgstr "Painel de instrumentos"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Tratadas pelas  subdivisões dentro de 5 dias úteis"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +909,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Excluidos"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +950,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Diligency prêmio tabela classificativa"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Salvar alterações"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,23 +981,25 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Duplicar"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Duplicar"
@@ -916,8 +1012,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -931,28 +1027,28 @@ msgid "Edit"
 msgstr "Editar"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Editar os detalhes do corpo"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -991,7 +1087,7 @@ msgstr "Editar"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Email adicionado a lista de abusos"
 
@@ -1009,7 +1105,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-mail já está na lista abusos"
 
@@ -1054,7 +1150,7 @@ msgstr "Endpoint"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Digite um nome de uma rua de Mindelo"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 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"
 
@@ -1088,8 +1184,8 @@ msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia"
 msgid "Error"
 msgstr "Erro"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Todos"
 
@@ -1103,14 +1199,22 @@ msgid "Examples:"
 msgstr "Exemplos:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1119,6 +1223,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1139,8 +1244,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Dados adicionais:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1165,10 +1270,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1176,6 +1283,8 @@ msgstr "FIX"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Corrigido - Concelho"
 
@@ -1184,7 +1293,7 @@ msgstr "Corrigido - Concelho"
 msgid "Fixed - User"
 msgstr "Corrigido - Usuario"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "relatórios corrigidos"
 
@@ -1193,7 +1302,7 @@ msgid "Fixed:"
 msgstr "Corrigido:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1279,11 +1388,13 @@ msgstr "Dê-me um feed RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr " Ir"
@@ -1292,11 +1403,11 @@ msgstr " Ir"
 msgid "Going to send questionnaire?"
 msgstr "Vai enviar questionário?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Status da tabela grafica ao longo do tempo"
 
@@ -1312,7 +1423,7 @@ msgstr "Este problema já foi fixado, relatado?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Alguma vez voce ja relatou algum problema ao município, ou é a sua primeira vez?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1337,6 +1448,9 @@ msgstr "Oi %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1344,6 +1458,11 @@ msgstr "Oi %s"
 msgid "Hidden"
 msgstr "Esconder"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Reenviar relatório"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Ocultar"
@@ -1352,6 +1471,10 @@ msgstr "Ocultar"
 msgid "Hide pins"
 msgstr "Ocultar pins"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "History pins"
@@ -1383,7 +1506,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Receio que não foi possível localizar o seu problema no banco de dados.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1401,6 +1524,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1411,7 +1538,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1469,8 +1596,8 @@ msgstr "ID ilegal"
 msgid "Illegal feed selection"
 msgstr "Seleção de feed ilegal"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1488,7 +1615,9 @@ msgstr "Além disso, os seguintes atributos que não fazem parte da especificaç
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1506,7 +1635,7 @@ msgstr "Incluir reports detalhes perssoais"
 msgid "Include unconfirmed reports"
 msgstr "Incluir dados nao confirmados"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Foto_has valor incorreto \"%s\""
 
@@ -1514,7 +1643,7 @@ msgstr "Foto_has valor incorreto \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1524,33 +1653,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Agencia_responsavel valor %s inválido"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Invalido data final"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Formato inválido%s especificado."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Data de inicio invalida"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1581,6 +1718,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Manter-me ligado neste computador"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Última atualização:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1594,11 +1740,12 @@ msgstr "Última atualização:"
 msgid "Last&nbsp;update:"
 msgstr "Última atualização:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1606,6 +1753,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Listar todos os problemas relatados"
@@ -1627,7 +1778,8 @@ msgstr "RSS feeds e alertas de e-mail locais"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "RSS feeds e alertas de e-mail locais para '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Alertas locais"
 
@@ -1635,15 +1787,36 @@ msgstr "Alertas locais"
 msgid "Locate the problem on a map of the area"
 msgstr "Localize o problema no mapa da área ou localidade"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "Mapa"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1667,7 +1840,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1687,7 +1860,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Falta informaçao jurisdiction_id"
 
@@ -1695,7 +1868,7 @@ msgstr "Falta informaçao jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1703,15 +1876,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Relatado por %s em %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Relatado por %s em %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderado por divisão dentro de um dia de trabalho"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "outras áreas:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Mês"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1719,7 +1909,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1747,7 +1937,7 @@ msgstr "Nome:"
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1756,7 +1946,7 @@ msgstr ""
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1765,7 +1955,7 @@ msgstr "Código postal mais próximo do pino colocado no mapa (gerado automatica
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1850,7 +2040,7 @@ msgstr "Novo estado"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1858,6 +2048,7 @@ msgstr ""
 msgid "Next"
 msgstr "Proximo"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1886,7 +2077,7 @@ msgstr "Nenhum corpo"
 msgid "No council"
 msgstr "Sem concelho"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Nenhum Concelho selecionado"
 
@@ -1904,6 +2095,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1914,6 +2107,14 @@ msgstr "Incapaz de ser resolvido"
 msgid "No further updates"
 msgstr "Sem mais atualizações"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Nenhum resultado retornado"
@@ -1954,6 +2155,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2015,6 +2218,14 @@ msgstr "Finalmente, para enviar a sua actualização ..."
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr " Velho / desconhecido <br>problems"
@@ -2031,7 +2242,7 @@ msgstr "Mais antigo <br>fixado"
 msgid "Older <br>problems"
 msgstr "Mais antigo <br>problemas"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2041,7 +2252,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2085,15 +2299,15 @@ msgstr "Ou os problemas relatados para:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou concelho você está inserido"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Outro"
 
@@ -2128,11 +2342,11 @@ msgstr "Password (opcional)"
 msgid "Password:"
 msgstr "Password:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2199,8 +2413,8 @@ msgstr "Coloque a fix pin no mapa"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2226,14 +2440,14 @@ msgid "Please check your email address is correct"
 msgstr "Favor verificar se seu email esta correcto"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Escolher uma categoria"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Por favor, escolha um tipo de imóvel"
 
@@ -2262,8 +2476,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Por favor insira uma mensagem"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2278,13 +2492,13 @@ msgid "Please enter a password"
 msgstr "Por favor insira uma password"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Por favor insira um assunto"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2297,7 +2511,7 @@ 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/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Por favor, insira alguns detalhes"
@@ -2324,14 +2538,14 @@ msgstr "Por favor, insira o seu endereço de email"
 msgid "Please enter your first name"
 msgstr "Digite seu primeiro nome"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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 conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2394,7 +2608,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Favor notar:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2427,10 +2641,10 @@ msgstr "Selecione o tipo de alerta que deseja"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Por favor, indique se o problema foi corrigido"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2453,15 +2667,15 @@ msgstr "Postar"
 msgid "Posted anonymously at %s"
 msgstr "Postado anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Postado por %s aem %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postado por <strong>%s</strong> (%s) em %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postado por <strong>%s</strong> em %s"
 
@@ -2477,12 +2691,12 @@ msgstr "Anterior"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2525,7 +2739,7 @@ msgstr "Problema %s enviado ao conselho %s"
 msgid "Problem breakdown by state"
 msgstr "Colapso problema por estado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problema marcado como aberto."
 
@@ -2533,7 +2747,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemas"
@@ -2554,13 +2768,13 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemas dentro de %.1fkm deste local"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemas dentro de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemas dentro de %s ala"
 
@@ -2606,7 +2820,7 @@ msgstr "Resposta do público:"
 msgid "Public response:"
 msgstr "Resposta do público:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2642,11 +2856,11 @@ msgstr "Questionário preenchido por problema repórter"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS feed para %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed for %s ala,%s"
 
@@ -2654,11 +2868,11 @@ msgstr "RSS feed for %s ala,%s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS feed de %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed de %s, %s problemas pendentes"
 
@@ -2666,13 +2880,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed dos Problemas Nesta %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed dos problemas dentro de %s ala"
 
@@ -2691,7 +2905,7 @@ msgstr "RSS feed de atualizações para este problema"
 msgid "Receive email when updates are left on this problem."
 msgstr "RSS feed dos problemas locais recentes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2709,7 +2923,7 @@ msgstr "Recentement <br>fixed"
 msgid "Recently reported problems"
 msgstr "Problemas recentemente reportados"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2748,12 +2962,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Reportar um problema"
@@ -2771,6 +2985,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Relatório sobre %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Abusivo"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2782,7 +3001,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Reportar, ver ou discutir problemas locais"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Relatado anonimamente em %s"
@@ -2792,7 +3011,7 @@ msgstr "Relatado anonimamente em %s"
 msgid "Reported before"
 msgstr "Relatado antes"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Relatado por %s em %s"
@@ -2806,27 +3025,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Relatado na categoria %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Relatado na categoria %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Relatado por %s anonimamente em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Relatado por %s por%s em %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Relatado por %s na categoria %s por %s em %s"
 
@@ -2850,11 +3069,12 @@ msgstr "Relatando um problema"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Relatórios"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2862,10 +3082,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr "Relatórios aguardando aprovação"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2874,7 +3090,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Os relatórios publicados"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Reportar um problema"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2886,10 +3107,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Reenviar relatório"
@@ -2921,6 +3138,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2936,15 +3165,15 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Girar para a esquerda"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2956,35 +3185,43 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 msgid "Save + close as duplicate"
 msgstr ""
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Busca Reports"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Procurar Usuários"
 
@@ -3011,7 +3248,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3045,7 +3282,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Enviado para %s %s mais tarde"
 
@@ -3058,7 +3295,7 @@ msgstr "Enviar:"
 msgid "Service:"
 msgstr "Srerviço:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3066,6 +3303,7 @@ msgstr ""
 msgid "Share"
 msgstr "Acçao"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3075,6 +3313,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3082,23 +3321,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Mostrar antigo"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Mostrar meu nome publicamente"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Mostrar meu nome publicamente"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Mostrar antigo"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Mostrar antigo"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Mostrar pins"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3138,7 +3397,7 @@ msgstr "Fotos de reports recentes"
 msgid "Some text to localize"
 msgstr "Algum informaçao para localizar"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida."
 
@@ -3169,15 +3428,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3195,12 +3460,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Estado"
@@ -3216,7 +3481,7 @@ msgstr "Estado"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3237,7 +3502,7 @@ msgstr "Ainda em aberto, via questionário, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Subcategoria: %s"
 
@@ -3265,7 +3530,7 @@ msgstr "Submeter"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3322,11 +3587,11 @@ msgstr "Resumo"
 msgid "Summary reports"
 msgstr "Resumo reports"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3389,7 +3654,7 @@ msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu pro
 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, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Essa imagem não parece ter sido  carregada corretamente (%s), por favor, tente novamente."
 
@@ -3403,7 +3668,7 @@ msgstr "Esse local não parece estar em Mindelo, por favor tente novamente."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente."
 
@@ -3559,7 +3824,7 @@ msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favo
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3633,18 +3898,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 para ambos os conselhos que cobrem o local do problema, como o usuário não categorizá-lo, por favor, ignorar se você não é o conselho correto para lidar com o problema, ou deixe-nos saber que categoria de problema é para que possamos adicioná-lo ao nosso sistema."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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 conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Esta informação é necessária"
 
@@ -3660,14 +3925,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Este problema foi resolvido"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Este problema não foi corrigido"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Este problema não foi corrigido"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3715,7 +3985,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3746,8 +4016,26 @@ msgstr "Para ver no mapa a localização exata desse problema"
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "marcado como fixo"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3755,7 +4043,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3780,7 +4068,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Não confirmado"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "por arranjar"
 
@@ -3804,6 +4093,10 @@ msgstr "Erro desconhecido"
 msgid "Unknown problem ID"
 msgstr "Desconhecido problema com ID"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3860,10 +4153,10 @@ msgstr "Atualizar status"
 msgid "Updated"
 msgstr "Atualizado"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3907,26 +4200,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Bandeira usuário removida"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Usuário sinalizado"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "marcado como fixo"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3957,6 +4256,15 @@ msgstr "Visualizando um local"
 msgid "Viewing a problem"
 msgstr "Visualizando um problema"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Wards deste concelho"
@@ -3976,7 +4284,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 este problema pode ser da responsabilidade do %s, no entanto, nós não possuímos nenhuma informação de contato deles. Se você souber de um endereço de contato apropriado, favor fornecer esse contacto. Obrigado."
 
@@ -3993,6 +4301,10 @@ msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4010,11 +4322,11 @@ msgstr "Quando editar"
 msgid "When sent"
 msgstr "Quando enviar"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4049,10 +4361,16 @@ msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de
 msgid "Wrong location? Just click again on the map."
 msgstr "Localização errada? Basta clicar novamente no mapa."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Ano"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4081,6 +4399,10 @@ msgstr "Sim, tenho uma password"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:"
@@ -4124,6 +4446,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Você recusou, por favor preencha o quadro de cima"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4182,7 +4508,7 @@ msgid "Your Reports"
 msgstr "Os meus relatórios"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4219,6 +4545,11 @@ msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/
 msgid "Your name"
 msgstr "Nome"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Os meus relatórios"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4248,6 +4579,10 @@ msgstr "Os meus relatórios"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Suas atualizações"
@@ -4258,7 +4593,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4266,7 +4601,7 @@ msgstr ""
 msgid "by %s"
 msgstr "por %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr ""
 
@@ -4294,49 +4629,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr "e %s usuários diferentes"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Última atualizada %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "menos de um minuto"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "marcados como fechados"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "marcado como fixo"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr ""
 
@@ -4347,7 +4682,7 @@ msgid "n/a"
 msgstr "n / a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4382,8 +4717,8 @@ msgstr "originalmente introduzido: \"%s\""
 msgid "other areas:"
 msgstr "outras áreas:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "reaberto"
 
@@ -4404,7 +4739,7 @@ msgstr "o município local"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "não há nenhum fix pin para o usuario usar no mapa"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "este tipo de problema local"
 
@@ -4412,6 +4747,16 @@ msgstr "este tipo de problema local"
 msgid "today"
 msgstr "de hoje"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Actualizar"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Actualizaçoes"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "mapa usado"
@@ -4429,27 +4774,41 @@ msgstr "usuário é proprietário problema"
 msgid "ward"
 msgstr "pendente"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4457,13 +4816,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d suppoter"
 msgstr[1] "%d supporters"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4492,6 +4858,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> atualização em relatório"
 msgstr[1] "<big>%s</big>Atualização dos relatórios"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Relatado por %s em %s"
+msgstr[1] "Relatado por %s em %s"
+
 #: 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."
@@ -4505,3 +4878,33 @@ 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] "Nós ainda não temos detalhes para o conselho, que abrange este local."
 msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "Última atualizada %s"
+msgstr[1] "Última atualizada %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Relatórios"
+msgstr[1] "Relatórios"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Todos os Relatórios"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Criar uma categoria"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Relatado por %s em %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "Última atualizada %s"
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 751e462d9..8e4776db9 100644
--- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "şi"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr ""
 
@@ -154,7 +154,7 @@ msgstr "(rezolvat)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(netrimis)"
 
@@ -162,17 +162,17 @@ msgstr "(netrimis)"
 msgid "(optional)"
 msgstr "(opțional)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Alege o categorie --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Alege un tip de proprietate --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -192,12 +200,20 @@ msgid ""
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -216,11 +232,11 @@ msgstr ""
 msgid "<strong>No</strong> let me sign in by email"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -232,6 +248,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -274,15 +292,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Adaugă utilizator"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -294,6 +312,10 @@ msgstr ""
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr ""
@@ -310,6 +332,12 @@ msgstr ""
 msgid "Alert me to future updates"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -319,12 +347,14 @@ msgstr ""
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -359,11 +389,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -400,7 +431,7 @@ msgstr ""
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -426,15 +457,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr ""
@@ -452,7 +491,7 @@ msgid "Ban email address"
 msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -461,7 +500,7 @@ msgid "Bodies"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -489,14 +528,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -507,7 +547,7 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -517,6 +557,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -524,7 +565,7 @@ msgstr ""
 msgid "Category:"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr ""
 
@@ -579,10 +620,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -613,10 +658,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -624,11 +671,11 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -654,6 +701,10 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+msgid "Collapse map"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -717,8 +768,8 @@ msgstr ""
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr ""
 
@@ -736,6 +787,36 @@ msgstr ""
 msgid "Council contacts for %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "marcat ca închis"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "marcat ca rezolvat"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "marcat ca fiind în curs de desfăşurare"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "marcat ca fiind în curs de cercetare"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "marcat ca planificat"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -760,15 +841,15 @@ msgstr ""
 msgid "Create category"
 msgstr ""
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -812,7 +893,11 @@ msgstr ""
 msgid "Dealt with by subdivision within 5 working days"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -826,6 +911,11 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -862,6 +952,11 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+msgid "Discard changes"
+msgstr ""
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -887,22 +982,24 @@ msgstr ""
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 msgid "Duplicate of"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 msgid "Duplicates"
 msgstr ""
 
@@ -914,8 +1011,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -929,28 +1026,28 @@ msgid "Edit"
 msgstr ""
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -989,7 +1086,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr ""
 
@@ -1007,7 +1104,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr ""
 
@@ -1052,7 +1149,7 @@ msgstr ""
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr ""
 
@@ -1086,8 +1183,8 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1101,14 +1198,22 @@ msgid "Examples:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1117,6 +1222,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1137,8 +1243,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1163,10 +1269,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1174,6 +1282,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr ""
 
@@ -1182,7 +1292,7 @@ msgstr ""
 msgid "Fixed - User"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1191,7 +1301,7 @@ msgid "Fixed:"
 msgstr ""
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr ""
@@ -1277,11 +1387,13 @@ msgstr ""
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr ""
@@ -1290,11 +1402,11 @@ msgstr ""
 msgid "Going to send questionnaire?"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr ""
 
@@ -1310,7 +1422,7 @@ msgstr ""
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr ""
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1335,6 +1447,9 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1342,6 +1457,10 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
+#: templates/web/base/report/_main.html:105
+msgid "Hide entire report"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr ""
@@ -1350,6 +1469,10 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr ""
@@ -1381,7 +1504,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1399,6 +1522,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1409,7 +1536,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1467,8 +1594,8 @@ msgstr ""
 msgid "Illegal feed selection"
 msgstr ""
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1486,7 +1613,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1504,7 +1633,7 @@ msgstr ""
 msgid "Include unconfirmed reports"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr ""
 
@@ -1512,7 +1641,7 @@ msgstr ""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1522,33 +1651,41 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1579,6 +1716,14 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+msgid "Last 7 days"
+msgstr ""
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1592,11 +1737,12 @@ msgstr ""
 msgid "Last&nbsp;update:"
 msgstr ""
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1604,6 +1750,10 @@ msgstr ""
 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/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr ""
@@ -1625,7 +1775,8 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr ""
 
@@ -1633,15 +1784,36 @@ msgstr ""
 msgid "Locate the problem on a map of the area"
 msgstr ""
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1665,7 +1837,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1685,7 +1857,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr ""
 
@@ -1693,7 +1865,7 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1701,15 +1873,29 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+msgid "Moderate this update"
+msgstr ""
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+msgid "Moderated by %s at %s"
+msgstr ""
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr ""
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+msgid "Moderation reason:"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1717,7 +1903,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1745,7 +1931,7 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1754,7 +1940,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1763,7 +1949,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1845,7 +2031,7 @@ msgstr ""
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1853,6 +2039,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1881,7 +2068,7 @@ msgstr ""
 msgid "No council"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr ""
 
@@ -1899,6 +2086,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1909,6 +2098,14 @@ msgstr ""
 msgid "No further updates"
 msgstr ""
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr ""
@@ -1949,6 +2146,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2010,6 +2209,14 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr ""
@@ -2026,7 +2233,7 @@ msgstr ""
 msgid "Older <br>problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2036,7 +2243,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2080,15 +2290,15 @@ msgstr ""
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr ""
 
@@ -2123,11 +2333,11 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2194,8 +2404,8 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2221,14 +2431,14 @@ msgid "Please check your email address is correct"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr ""
 
@@ -2254,8 +2464,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2270,13 +2480,13 @@ msgid "Please enter a password"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2289,7 +2499,7 @@ msgstr ""
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr ""
@@ -2316,14 +2526,14 @@ msgstr ""
 msgid "Please enter your first name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2386,7 +2596,7 @@ msgstr ""
 msgid "Please note:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2419,10 +2629,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2445,15 +2655,15 @@ msgstr ""
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr ""
 
@@ -2469,12 +2679,12 @@ msgstr ""
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2516,7 +2726,7 @@ msgstr ""
 msgid "Problem breakdown by state"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr ""
 
@@ -2524,7 +2734,7 @@ msgstr ""
 msgid "Problem state change based on survey results"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr ""
@@ -2545,13 +2755,13 @@ msgstr ""
 msgid "Problems within %.1fkm of this location"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr ""
 
@@ -2596,7 +2806,7 @@ msgstr ""
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2632,11 +2842,11 @@ msgstr ""
 msgid "RSS feed"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr ""
 
@@ -2644,11 +2854,11 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2656,13 +2866,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2681,7 +2891,7 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2699,7 +2909,7 @@ msgstr ""
 msgid "Recently reported problems"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2738,12 +2948,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr ""
@@ -2761,6 +2971,10 @@ msgstr ""
 msgid "Report on %s"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:137
+msgid "Report state:"
+msgstr ""
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2772,7 +2986,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr ""
@@ -2782,7 +2996,7 @@ msgstr ""
 msgid "Reported before"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr ""
@@ -2796,27 +3010,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr ""
 
@@ -2840,11 +3054,12 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr ""
 
@@ -2852,10 +3067,6 @@ msgstr ""
 msgid "Reports awaiting approval"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2864,7 +3075,11 @@ msgstr ""
 msgid "Reports published"
 msgstr ""
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+msgid "Reports saved offline."
+msgstr ""
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2876,10 +3091,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr ""
@@ -2911,6 +3122,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2926,15 +3149,15 @@ msgstr ""
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2946,36 +3169,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "marcat ca raport duplicat"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr ""
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr ""
 
@@ -3002,7 +3233,7 @@ msgstr ""
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3036,7 +3267,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr ""
 
@@ -3049,7 +3280,7 @@ msgstr ""
 msgid "Service:"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3057,6 +3288,7 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3066,6 +3298,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3073,23 +3306,40 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+msgid "Show Photo?"
+msgstr ""
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr ""
 
+#: templates/web/base/report/update.html:17
+msgid "Show name publicly?"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr ""
 
+#: templates/web/base/report/_main.html:79
+msgid "Show photo"
+msgstr ""
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr ""
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3129,7 +3379,7 @@ msgstr ""
 msgid "Some text to localize"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3160,15 +3410,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3186,12 +3442,12 @@ msgstr ""
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr ""
@@ -3207,7 +3463,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3228,7 +3484,7 @@ msgstr ""
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr ""
 
@@ -3256,7 +3512,7 @@ msgstr ""
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3313,11 +3569,11 @@ msgstr ""
 msgid "Summary reports"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3380,7 +3636,7 @@ msgstr ""
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
@@ -3394,7 +3650,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr ""
 
@@ -3550,7 +3806,7 @@ msgstr ""
 msgid "There was a problem showing this page. Please try again later."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3624,18 +3880,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr ""
 
@@ -3651,14 +3907,18 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr ""
 
+#: templates/web/base/report/update/form_update.html:54
+msgid "This problem is still ongoing"
+msgstr ""
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3706,7 +3966,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3737,8 +3997,26 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "marcat ca rezolvat"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3746,7 +4024,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3771,7 +4049,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3795,6 +4074,10 @@ msgstr ""
 msgid "Unknown problem ID"
 msgstr ""
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3851,10 +4134,10 @@ msgstr ""
 msgid "Updated"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3898,26 +4181,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "marcat ca rezolvat"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3948,6 +4237,15 @@ msgstr ""
 msgid "Viewing a problem"
 msgstr ""
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -3967,7 +4265,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 ""
 
@@ -3984,6 +4282,10 @@ msgstr ""
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4001,11 +4303,11 @@ msgstr ""
 msgid "When sent"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4040,10 +4342,16 @@ msgstr ""
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr ""
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4072,6 +4380,10 @@ msgstr ""
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4115,6 +4427,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4173,7 +4489,7 @@ msgid "Your Reports"
 msgstr "Rapoartele dvs."
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4210,6 +4526,11 @@ msgstr ""
 msgid "Your name"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Rapoartele dvs."
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4239,6 +4560,10 @@ msgstr ""
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr ""
@@ -4249,7 +4574,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4257,7 +4582,7 @@ msgstr ""
 msgid "by %s"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "marcat ca raport duplicat"
 
@@ -4285,49 +4610,49 @@ msgstr ""
 msgid "from %s different users"
 msgstr ""
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr ""
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "mai puţin de un minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "marcat ca acţiune planificată"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "marcat ca trimitere internă"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "marcat ca închis"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "marcat ca rezolvat"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "marcat ca fiind în curs de desfăşurare"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "marcat ca fiind în curs de cercetare"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "marcat ca imposibil de rezolvat"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "marcat ca nefiind responsabilitatea consiliului"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "marcat ca planificat"
 
@@ -4338,7 +4663,7 @@ msgid "n/a"
 msgstr "indisponibil"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4373,8 +4698,8 @@ msgstr ""
 msgid "other areas:"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr ""
 
@@ -4395,7 +4720,7 @@ msgstr ""
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr ""
 
@@ -4403,6 +4728,15 @@ msgstr ""
 msgid "today"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:73
+msgid "update"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "%s actualizări"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr ""
@@ -4420,7 +4754,15 @@ msgstr ""
 msgid "ward"
 msgstr ""
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4428,7 +4770,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4436,7 +4778,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4444,6 +4786,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: perllib/Utils.pm:246
+#, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4452,7 +4802,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4460,6 +4810,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4492,6 +4850,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: templates/web/base/report/_item.html:49
+#, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: 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."
@@ -4507,3 +4873,23 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: templates/web/base/report/_item.html:59
+#, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Rapoartele dvs."
+msgstr[1] "Rapoartele dvs."
+msgstr[2] "Rapoartele dvs."
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Adaugă o categorie nouă"
diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2abdae88f..eaf6cf8df 100644
--- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ru.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "и"
 
@@ -114,11 +114,11 @@ msgstr ""
 "будет отправлено в орган самоуправления района и появится в обоих уведомлениях этого самоуправления. Но для органа самоуправления области оно появится только в \n"
 "разделе «Внутри границ области»."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s район, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, в пределах района: %s"
 
@@ -166,7 +166,7 @@ msgstr "(исправлено)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(например: граффити, мусор в неположенных местах, поврежденная тротуарная плитка, разбитые уличные фонари)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(не отправлено в органы самоуправления)"
 
@@ -174,17 +174,17 @@ msgstr "(не отправлено в органы самоуправления)
 msgid "(optional)"
 msgstr "(необязательно)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(отправлено в обе инстанции)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Выберите категорию --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Выберите тип имущества --"
 
@@ -196,6 +196,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -207,12 +215,20 @@ msgstr ""
 "Возможно, поэтому поле «зона покрытия» не заполнено (см. ниже).<br>\n"
 "Хотите добавить несколько <code>MAPIT_TYPES</code> в ваш файл конфигурации?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Показать отчеты:</label> %s <label for=\"filter_categories\">в категории:</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -231,11 +247,11 @@ msgstr "<strong>Нет</strong> Я хочу подтвердить обновл
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Нет</strong>, я хочу войти на сайт с помощью адреса эл. почты"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -247,6 +263,8 @@ msgstr "<strong>Да</strong> У меня есть пароль"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -292,15 +310,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Добавить пользователя"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -312,6 +330,10 @@ msgstr "Добавлено: %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Снова:"
@@ -328,6 +350,12 @@ msgstr "Уведомление «%d» отключено (создано: %s)"
 msgid "Alert me to future updates"
 msgstr "Оповещать меня об обновлениях в будущем"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -337,12 +365,14 @@ msgstr "Все Отчеты"
 msgid "All Reports as CSV"
 msgstr "Все обращения в виде CSV-файлов"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -377,11 +407,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Вы разработчик?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -418,7 +449,7 @@ msgstr "Направить во внешнее учреждение:"
 msgid "Assign to subdivision:"
 msgstr "Направить в подразделение:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -444,15 +475,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Ожидает модерации"
@@ -470,7 +509,7 @@ msgid "Ban email address"
 msgstr "Добавить адрес эл. почты в черный список"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -479,7 +518,7 @@ msgid "Bodies"
 msgstr "Учреждения"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -507,14 +546,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -525,7 +565,7 @@ msgstr ""
 msgid "Category"
 msgstr "Категория"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -535,6 +575,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Процент устранения неполадок в этой категории,  которым больше 4 недель"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -542,7 +583,7 @@ msgstr "Процент устранения неполадок в этой ка
 msgid "Category:"
 msgstr "Категория:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Категория: %s"
 
@@ -610,10 +651,14 @@ msgstr ""
 "Выберите название <strong>категории</strong> которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и  \n"
 "                  сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений."
 
-#: templates/web/base/report/_inspect.html:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -644,10 +689,12 @@ msgstr "Чтобы войти, пройдите по ссылке, указан
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -655,11 +702,11 @@ msgstr "Чтобы войти, пройдите по ссылке, указан
 msgid "Closed"
 msgstr "Закрыто"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Закрыто органом самоуправления"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "закрытые обращения"
 
@@ -685,6 +732,11 @@ msgstr "Данные о кобренде:"
 msgid "Cobrand:"
 msgstr "Кобренд:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Использованная карта"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -748,8 +800,8 @@ msgstr "Свяжитесь с командой"
 msgid "Coordinates:"
 msgstr "Координаты:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Не удалось найти пользователя"
 
@@ -767,6 +819,36 @@ msgstr "Орган самоуправления"
 msgid "Council contacts for %s"
 msgstr "Контакты органа самоуправления для %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "помечено как закрытое"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "помечено как решенное"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "помечено как находящееся в процессе разрешения"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "помечено как находящееся в процессе расследования"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "помечено как запланированное"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Ссылка на орган самоуправления:&nbsp;%s"
@@ -791,15 +873,15 @@ msgstr "Создать обращение"
 msgid "Create category"
 msgstr "Создать категорию"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -843,7 +925,11 @@ msgstr "Панель управления"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Вопрос решен подразделением в течение 5 рабочих дней"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -857,6 +943,11 @@ msgstr "Удалить шаблон"
 msgid "Deleted"
 msgstr "Удалено"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -893,6 +984,12 @@ msgstr "Карта не использовалась"
 msgid "Diligency prize league table"
 msgstr "Таблица самых активных пользователей"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Сохранить изменения"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -918,23 +1015,25 @@ msgstr "Не любите заполнять формы?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Создать копию"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Создать копию"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Создать копию"
@@ -951,8 +1050,8 @@ msgstr ""
 "            Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n"
 "    "
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -966,28 +1065,28 @@ msgid "Edit"
 msgstr "Редактировать"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Редактировать информацию об учреждении"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1026,7 +1125,7 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Адрес эл. почты"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Адрес эл. почты добавлен в черный список"
 
@@ -1044,7 +1143,7 @@ msgstr "Создано уведомление по эл. почте"
 msgid "Email alert deleted"
 msgstr "Уведомление по эл. почте удалено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Этот адрес эл. почты уже находится в черном списке"
 
@@ -1096,7 +1195,7 @@ msgstr "Конечная точка"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Введите название улицы в Цюрихе"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион"
 
@@ -1130,8 +1229,8 @@ msgstr "Подробно опишите проблему"
 msgid "Error"
 msgstr "Ошибка"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Всё"
 
@@ -1145,14 +1244,23 @@ msgid "Examples:"
 msgstr "Примеры:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Все обращения в виде CSV-файлов"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1161,6 +1269,7 @@ msgid "Extern"
 msgstr "Внешн."
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1181,8 +1290,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Дополнительная информация:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1207,10 +1316,12 @@ msgstr "Исправьте это, выбрав <strong>зону покрыти
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1218,6 +1329,8 @@ msgstr "Исправлено"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Исправлено (орган самоуправления)"
 
@@ -1226,7 +1339,7 @@ msgstr "Исправлено (орган самоуправления)"
 msgid "Fixed - User"
 msgstr "Исправлено (пользователь)"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "решенные проблемы"
 
@@ -1235,7 +1348,7 @@ msgid "Fixed:"
 msgstr "Исправлено:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Пометить как удаленное"
@@ -1321,11 +1434,13 @@ msgstr "Подпишите меня на RSS-фид"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Здорово, что проблема решена!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Поехали!"
@@ -1334,11 +1449,11 @@ msgstr "Поехали!"
 msgid "Going to send questionnaire?"
 msgstr "Собираетесь отправить опрос?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "График устранения неполадки: статус/время"
 
@@ -1354,7 +1469,7 @@ msgstr "Эта проблема решена?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Вы впервые отправляете обращение в орган самоуправления?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1379,6 +1494,9 @@ msgstr "Привет, %s!"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1386,6 +1504,11 @@ msgstr "Привет, %s!"
 msgid "Hidden"
 msgstr "Скрыто"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Отправить обращение еще раз"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Скрыть старые"
@@ -1394,6 +1517,10 @@ msgstr "Скрыть старые"
 msgid "Hide pins"
 msgstr "Скрыть метки"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "История"
@@ -1425,7 +1552,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1445,6 +1572,10 @@ msgstr ""
 "Введите название <strong>ответственной организации</strong> если это учреждение работает под началом другой организации.\n"
 "          В случае с базовыми установками вам не нужно объединять учреждения."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1457,7 +1588,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1525,8 +1656,8 @@ msgstr "Неверный идентификатор"
 msgid "Illegal feed selection"
 msgstr "Неверно выбран фид"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1544,7 +1675,9 @@ msgstr "Кроме того, возвращаются следующие пар
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1562,7 +1695,7 @@ msgstr "Включить персональные данные заявител
 msgid "Include unconfirmed reports"
 msgstr "Включить неподтвержденные обращения"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Нверно задано значение has_photo \"%s\""
 
@@ -1570,7 +1703,7 @@ msgstr "Нверно задано значение has_photo \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1580,33 +1713,41 @@ msgstr "Внутренние заметки"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Внутренний реферал"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Неверно задано значение agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Неверно указана дата окончания"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Неверно задан формат: %s."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Неверно указана дата начала"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1637,6 +1778,15 @@ msgstr "Юрисдикция неизвестна"
 msgid "Keep me signed in on this computer"
 msgstr "Запомнить мой логин и пароль на этом компьютере"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Последнее обновление:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1650,11 +1800,12 @@ msgstr "Последнее обновление:"
 msgid "Last&nbsp;update:"
 msgstr "Последнее&nbsp;обновление:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1662,6 +1813,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Оставьте поле пустым, если все обращения в это учреждение должны быть отправлены единым способом (например: «%s»)."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Все сообщения о неполадках в виде списка"
@@ -1683,7 +1838,8 @@ msgstr "Местные RSS-фиды и уведомления по эл. поч
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Местные RSS-фиды и уведомления по эл. почте (‘%s’)"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Местные уведомления"
 
@@ -1691,15 +1847,36 @@ msgstr "Местные уведомления"
 msgid "Locate the problem on a map of the area"
 msgstr "Укажите на карте местоположение проблемы"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "КАРТА"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1723,7 +1900,7 @@ msgstr "Помечено как решенный/закрытый вопрос 
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Помечено как решенный/закрытый вопрос более восьми недель назад"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1743,7 +1920,7 @@ msgstr "Сообщение внешнему учреждению:"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Не найден параметр jurisdiction_id"
 
@@ -1751,7 +1928,7 @@ msgstr "Не найден параметр jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1759,15 +1936,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Автор обращения: %s, время отправки: %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Автор обращения: %s, время отправки: %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Прошло модерацию в течение одного рабочего дня"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "другие области"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Месяц"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1775,7 +1969,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1803,7 +1997,7 @@ msgstr "Имя:"
 msgid "Name: %s"
 msgstr "Имя: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1812,7 +2006,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Ближайший к метке почтовый индекс (генерируется автоматически):  %s (%sm мил.)"
 
@@ -1821,7 +2015,7 @@ msgstr "Ближайший к метке почтовый индекс (гене
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1905,7 +2099,7 @@ msgstr "Новый статус"
 msgid "New template"
 msgstr "Новый шаблон"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1913,6 +2107,7 @@ msgstr ""
 msgid "Next"
 msgstr "Далее"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1941,7 +2136,7 @@ msgstr "Нет учреждения"
 msgid "No council"
 msgstr "Нет органа самоуправления"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Орган самоуправления не выбран"
 
@@ -1959,6 +2154,8 @@ msgstr "Не найдено помеченных пользователей."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1969,6 +2166,14 @@ msgstr "Невозможно устранить"
 msgid "No further updates"
 msgstr "Пока нет обновлений"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Результатов нет"
@@ -2015,6 +2220,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2076,6 +2283,14 @@ msgstr "Теперь обновление можно отправить&hellip;"
 msgid "OK"
 msgstr "ОК"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Давние/неизвестные <br>неполадки"
@@ -2092,7 +2307,7 @@ msgstr "Более давние <br>устраненные"
 msgid "Older <br>problems"
 msgstr "Давние <br>неполадки"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2102,7 +2317,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2146,15 +2364,15 @@ msgstr "Или данные о неполадках, отправленные с
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Вы также можете подписаться на уведомления, выбрав свой район или орган самоуправления:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Другое"
 
@@ -2189,11 +2407,11 @@ msgstr "Пароль (необязательно)"
 msgid "Password:"
 msgstr "Пароль:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Постоянная ссылка"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2260,8 +2478,8 @@ msgstr "Поставить метку на карте"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2287,14 +2505,14 @@ msgid "Please check your email address is correct"
 msgstr "Проверьте правильность написания адреса эл. почты"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Выберите категорию"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Выберите тип имущества"
 
@@ -2323,8 +2541,8 @@ msgstr "Будьте вежливы! Грубые, некорректные об
 msgid "Please enter a message"
 msgstr "Введите текст сообщения"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2339,13 +2557,13 @@ msgid "Please enter a password"
 msgstr "Введите пароль"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Введите тему"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2358,7 +2576,7 @@ msgstr "Введите действующий адрес эл. почты"
 msgid "Please enter a valid email address"
 msgstr "Введите действующий адрес эл. почты"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Введите дополнительную информацию"
@@ -2385,14 +2603,14 @@ msgstr "Введите адрес своей эл. почты"
 msgid "Please enter your first name"
 msgstr "Введите свое имя"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2455,7 +2673,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Внимание:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2488,10 +2706,10 @@ msgstr "Выберите тип уведомления"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Сообщите о статусе неполадки: проблема была решена?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2514,15 +2732,15 @@ msgstr "Опубликовать"
 msgid "Posted anonymously at %s"
 msgstr "Опубликовано анонимно (%s)"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Автор публикации: %s, время публикации: %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Автор публикации: <strong>%s</strong> (%s), время публикации: %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s"
 
@@ -2538,12 +2756,12 @@ msgstr "Предыдущая"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
@@ -2586,7 +2804,7 @@ msgstr "Проблема (%s) отправлена в орган самоупр
 msgid "Problem breakdown by state"
 msgstr "Сортировка проблем по статусу"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Проблема помечена как открытая."
 
@@ -2594,7 +2812,7 @@ msgstr "Проблема помечена как открытая."
 msgid "Problem state change based on survey results"
 msgstr "Смена статуса проблемы на основании результатов опроса"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Проблемы"
@@ -2615,13 +2833,13 @@ msgstr "Недавно решенные проблемы на сайте FixMySt
 msgid "Problems within %.1fkm of this location"
 msgstr "Проблемы в пределах %.1fkm от этого места"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Проблемы в пределах этого места: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Проблемы в пределах этого района: %s"
 
@@ -2667,7 +2885,7 @@ msgstr "Публичный ответ:"
 msgid "Public response:"
 msgstr "Публичный ответ:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2703,11 +2921,11 @@ msgstr "Опрос заполнен автором обращения"
 msgid "RSS feed"
 msgstr "RSS-фид"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS-фид для: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-фид для района: %s, %s"
 
@@ -2715,11 +2933,11 @@ msgstr "RSS-фид для района: %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "%s: RSS-фид"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s: RSS-фид, в пределах района: %s"
 
@@ -2727,13 +2945,13 @@ msgstr "%s: RSS-фид, в пределах района: %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-фид о проблемах поблизости"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS-фид о проблемах в пределах: %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-фид о проблемах в пределах района: %s"
 
@@ -2752,7 +2970,7 @@ msgstr "RSS-фид об обновлениях по этой проблеме"
 msgid "Receive email when updates are left on this problem."
 msgstr "Получать эл. письма об обновлениях по этой проблеме."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2770,7 +2988,7 @@ msgstr "Недавно <br>устранены"
 msgid "Recently reported problems"
 msgstr "Недавние обращения о проблемах"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2809,12 +3027,12 @@ msgid "Report"
 msgstr "Сообщить"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Сообщить о проблеме"
@@ -2832,6 +3050,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Сообщить о пользователе: %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Обращение отправлено:"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2843,7 +3066,7 @@ msgstr "Сообщить о своей проблеме"
 msgid "Report, view, or discuss local problems"
 msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте."
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Сообщено анонимно в: %s"
@@ -2853,7 +3076,7 @@ msgstr "Сообщено анонимно в: %s"
 msgid "Reported before"
 msgstr "Сообщено ранее"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Автор обращения: %s, время отправки: %s"
@@ -2867,27 +3090,27 @@ msgstr "Автор обращения:"
 msgid "Reported in the %s category"
 msgstr "Обращение отнесено к категории: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Обращение (категория: %s) отправлено анонимно в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Анонимно отправлено через: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Отправлено через: %s, автор: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s"
 
@@ -2911,11 +3134,12 @@ msgstr "Сообщение о проблеме"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Обращения"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Количество символов в тексте обращения не должно превышать %s. Напишите более короткое обращение."
 
@@ -2923,10 +3147,6 @@ msgstr "Количество символов в тексте обращения
 msgid "Reports awaiting approval"
 msgstr "Обращения, ожидающие проверки"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2935,7 +3155,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Опубликованные обращения"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Сообщить о проблеме"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2947,10 +3172,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Отправить обращение еще раз"
@@ -2982,6 +3203,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr "Шаблоны ответов для: %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2997,15 +3230,15 @@ msgstr "Дорога находится в ведении: %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3017,36 +3250,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении"
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Спутник"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "помечено как копия обращения"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Искать обращения"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Искать пользователей"
 
@@ -3073,7 +3314,7 @@ msgstr "Пользователи не найдены."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3107,7 +3348,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "Обращение возвращено"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Отправлено позже: %s %s"
 
@@ -3120,7 +3361,7 @@ msgstr "Отправлено:"
 msgid "Service:"
 msgstr "Сервис:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3128,6 +3369,7 @@ msgstr ""
 msgid "Share"
 msgstr "Поделиться"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3137,6 +3379,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3144,23 +3387,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Показать давние"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Показывать мое имя на сайте"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Показывать мое имя на сайте"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Показать давние"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Показать давние"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Показать метки"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3202,7 +3465,7 @@ msgstr "Некоторые фото недавних обращений"
 msgid "Some text to localize"
 msgstr "Некоторое количество текста для локализации"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется."
 
@@ -3233,15 +3496,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Не удалось проанализировать это местоположение. Повторите попытку."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Не удалось сохранить фото. Повторите попытку."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3259,12 +3528,12 @@ msgstr "Дата начала:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Статус"
@@ -3280,7 +3549,7 @@ msgstr "Статус:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3301,7 +3570,7 @@ msgstr "Открыто (через опрос): %s"
 msgid "Street View"
 msgstr "Просмотр улиц"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Субкатегория: %s"
 
@@ -3329,7 +3598,7 @@ msgstr "Отправить"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3386,11 +3655,11 @@ msgstr "Итог"
 msgid "Summary reports"
 msgstr "Отчеты об итогах"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3453,7 +3722,7 @@ msgstr "Спасибо за предоставленное фото. Тепер
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "Мы рады узнать, что проблема решена! Это было ваше первое обращение в орган самоуправления?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Кажется, возникли трудности с загрузкой фото (%s).Повторите попытку."
 
@@ -3467,7 +3736,7 @@ msgstr "Это местоположение находится за предел
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Не удалось распознать индекс."
 
@@ -3635,7 +3904,7 @@ msgstr "При загрузке страницы «Все обращения» 
 msgid "There was a problem showing this page. Please try again later."
 msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3719,18 +3988,18 @@ msgstr ""
 "В это учреждение будут отправляться только те обращения, неполадки в которых находятся на <strong>подведомственной территории</strong>.\n"
 "          Чтобы получать обращения, учреждению необходимо иметь в ведении минимум одну область."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr "Поскольку пользователь не обозначил категорию проблемы, обращение было отправлено в оба органа самоуправления. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение. Вы также можете написать нам, к какой категории относится данная проблема, и мы добавим новую информацию в систему."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Эта информация является обязательной"
 
@@ -3746,14 +4015,19 @@ msgstr "Это краткая информация по всем обращен
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Эта проблема была решена"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Эта проблема не была решена"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Эта проблема не была решена"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3801,7 +4075,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3832,8 +4106,26 @@ msgstr "Просмотр точного местоположения данно
 msgid "Total"
 msgstr "Всего"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "помечено как решенное"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3841,7 +4133,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3866,7 +4158,8 @@ msgstr "Напишите нам:"
 msgid "Unconfirmed"
 msgstr "Не подтверждено"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "обращения с неустраненными неполадками"
 
@@ -3890,6 +4183,10 @@ msgstr "Неизвестная ошибка"
 msgid "Unknown problem ID"
 msgstr "Неизвестный идентификатор проблемы"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3946,10 +4243,10 @@ msgstr "Обновление статусов"
 msgid "Updated"
 msgstr "Обновлено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3993,26 +4290,32 @@ msgstr "Использованная карта"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Пометка удалена"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Аккаунт пользователя помечен"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "помечено как решенное"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Пользователи"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4043,6 +4346,15 @@ msgstr "Просмотр местоположения"
 msgid "Viewing a problem"
 msgstr "Просмотр проблемы"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Районы, которые находятся в ведении данного органа самоуправления"
@@ -4062,7 +4374,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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;. Однако в нашей системе нет ее контактных данных. Если вам известен действующий адрес этой организации, напишите нам об этом."
 
@@ -4079,6 +4391,10 @@ msgstr "Мы обязуемся использовать предоставле
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Мы свяжемся с вами при первой возможности."
@@ -4096,11 +4412,11 @@ msgstr "Когда были отредактированы данные"
 msgid "When sent"
 msgstr "Когда были отправлены данные"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4135,10 +4451,16 @@ msgstr "Избегайте пунктуационных ошибок и не п
 msgid "Wrong location? Just click again on the map."
 msgstr "Неверно указано местоположение? Нажмите на карту еще раз."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Год"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4167,6 +4489,10 @@ msgstr "Да, у меня есть пароль"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Вы считаете, что эта проблема не нуждалась в модерации:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:"
@@ -4213,6 +4539,10 @@ msgstr "Вы можете отметить учреждение как удал
 msgid "You declined; please fill in the box above"
 msgstr "Вы отказались; заполните форму выше"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4274,7 +4604,7 @@ msgid "Your Reports"
 msgstr "Ваши обращения"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4311,6 +4641,11 @@ msgstr "Мы обязуемся использовать предоставле
 msgid "Your name"
 msgstr "Ваше имя"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Ваши обращения"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4340,6 +4675,10 @@ msgstr "Ваши обращения"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Ваши обновления"
@@ -4350,7 +4689,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4358,7 +4697,7 @@ msgstr ""
 msgid "by %s"
 msgstr "автор: %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "помечено как копия обращения"
 
@@ -4386,49 +4725,49 @@ msgstr "редактировать информацию о пользовате
 msgid "from %s different users"
 msgstr "от разных пользователей (%s)"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "последнее обновление: %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "менее минуты"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "помечено как запланированное действие"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "помечено как внутренний реферал"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "помечено как закрытое"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "помечено как решенное"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "помечено как находящееся в процессе разрешения"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "помечено как находящееся в процессе расследования"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "помечено как проблема, которую невозможно устранить"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "помечено как вопрос вне ответственности органа управления"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "помечено как запланированное"
 
@@ -4439,7 +4778,7 @@ msgid "n/a"
 msgstr "недоступн."
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4474,8 +4813,8 @@ msgstr "введено: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "другие области"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "заново открыто"
 
@@ -4496,7 +4835,7 @@ msgstr "местный орган самоуправления"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "метка не отображается, так как карта не была использована"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "этот тип проблемы поблизости"
 
@@ -4504,6 +4843,16 @@ msgstr "этот тип проблемы поблизости"
 msgid "today"
 msgstr "сегодня"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Обновление"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Обновления"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "карта использована"
@@ -4521,7 +4870,16 @@ msgstr "неполадка находится в собственности по
 msgid "ward"
 msgstr "район"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4530,7 +4888,7 @@ msgstr[1] "%d дня"
 msgstr[2] "%d дней"
 msgstr[3] "%d дней"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4539,7 +4897,7 @@ msgstr[1] "%d часа"
 msgstr[2] "%d часов"
 msgstr[3] "%d часов"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4548,6 +4906,15 @@ msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 msgstr[3] "%d минут"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d минута"
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
+msgstr[3] "%d минут"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4557,7 +4924,7 @@ msgstr[1] "%d спонсора"
 msgstr[2] "%d спонсоров"
 msgstr[3] "%d спонсоров"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4566,6 +4933,15 @@ msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 msgstr[3] "%d недель"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4602,6 +4978,15 @@ msgstr[1] "<big>%s</big> обновления обращений"
 msgstr[2] "<big>%s</big> обновлений обращений"
 msgstr[3] "<big>%s</big> обновлений обращений"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Автор обращения: %s, время отправки: %s"
+msgstr[1] "Автор обращения: %s, время отправки: %s"
+msgstr[2] "Автор обращения: %s, время отправки: %s"
+msgstr[3] "Автор обращения: %s, время отправки: %s"
+
 #: 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."
@@ -4619,3 +5004,41 @@ msgstr[0] "У нас еще нет подробной информации об
 msgstr[1] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
 msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "последнее обновление: %s"
+msgstr[1] "последнее обновление: %s"
+msgstr[2] "последнее обновление: %s"
+msgstr[3] "последнее обновление: %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Сообщить"
+msgstr[1] "Сообщить"
+msgstr[2] "Сообщить"
+msgstr[3] "Сообщить"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Все Отчеты"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Внешний URL"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Создать категорию"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Автор обращения: %s, время отправки: %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "последнее обновление: %s"
diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
index c9fd444be..089118465 100644
--- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sq.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Granit Zhubi <granitzhubi@gmail.com>, 2016\n"
 "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "dhe"
 
@@ -110,11 +110,11 @@ msgstr ""
 "%s dërgon kategori të ndryhme të problemit\n"
 "tek Drejtoria adekuate e Komunës, kështu që problemet që paraqiten jashtë Komunës perkatëse nuk do ti shkojnë asaj.  Si shembull një raport per graffiti do ti dërgohet Komunës, mirëpo do ti dërgohet vetëm Komunës së caktuar në hartë."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s lagje, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, brenda lagjes %s"
 
@@ -162,7 +162,7 @@ msgstr "(i rregulluar)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(Si mbishkrime, pllaka të thyera , ose ndriçimit të rrugëve)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(nuk ju dergua kuvendit)"
 
@@ -170,17 +170,17 @@ msgstr "(nuk ju dergua kuvendit)"
 msgid "(optional)"
 msgstr "(opsionale)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(dërguar te të dy)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Zgjedh në kategori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Zgjedh nje lloj te karakteristikes --"
 
@@ -192,6 +192,14 @@ msgstr "--Zgjedh një template--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -203,14 +211,22 @@ msgstr ""
 "              Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).<br>\n"
 "              Ndoshta shtoni disa <code>MAPIT_TYPES</code> ne skedarin tuaj te konfigurimit?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 "Paraqit\n"
 "për"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -229,11 +245,11 @@ msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Jo</strong> më lejo të kyqem me email"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<Strong> Shënim: </ strong> Ky raport është dërguar tutje për veprim. Çdo ndryshim i bërë tutje nuk do të kalojë."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<Strong> Shënim: </ strong> Ky raport nuk është dërguar ende në vazhdim për veprim. Çdo ndryshim i bërë nuk mund të kalohet."
 
@@ -245,6 +261,8 @@ msgstr "<strong>Po</strong> Unë kam një fjalëkalim"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -289,15 +307,15 @@ msgstr "Shto në listën e ngushtë"
 msgid "Add user"
 msgstr "Shto përdorues"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Shto/përditëso kategoritë e problemeve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Shto/përditëso prioritetet e përgjigjeve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Shto/Përditëso përgjigjet nga template"
 
@@ -309,6 +327,10 @@ msgstr "Shtoi %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr "Duke shtuar këtë raport në listën tuaj do të heqni atë nga lista %s''s e ngushtë."
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Perseri:"
@@ -325,6 +347,13 @@ msgstr "Notifikimi %d i ndalur (krijuar %s)"
 msgid "Alert me to future updates"
 msgstr "Me paralajmero per perditesime ne te ardhmen"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "Të gjitha"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -334,12 +363,14 @@ msgstr "Te gjitha Raportimet"
 msgid "All Reports as CSV"
 msgstr "Të gjitha raportet si CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Të gjitha kategoritë"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -374,11 +405,12 @@ msgstr "Përdorues tjetër"
 msgid "Are you a developer?"
 msgstr "A jeni nje zhvillues?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Jeni te sigurte qe doni te anuloni këtë upload?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "A jeni të sigurtë?"
@@ -415,7 +447,7 @@ msgstr "Caktoja një drejtorije të jashtme:"
 msgid "Assign to subdivision:"
 msgstr "Cakto per nenndarje:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr "Cakto përdorues për ëonat"
 
@@ -441,15 +473,23 @@ msgid "Auto-response:"
 msgstr "Përgjigje-Automatike:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Kategoritë në dispozicion"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Shmangni të dhënat personale dhe targat e automjeteve"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Në pritje të vlerësimit"
@@ -467,7 +507,7 @@ msgid "Ban email address"
 msgstr "bllokoemail adresen"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -476,7 +516,7 @@ msgid "Bodies"
 msgstr "Drejtoritë"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -504,14 +544,15 @@ msgid "Categories"
 msgstr "Kategoritë"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Kategoritë:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -522,7 +563,7 @@ msgstr "Kategoritë:"
 msgid "Category"
 msgstr "Kategoria"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategoria u ndryshua nga '%s' në '%s'"
 
@@ -532,6 +573,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Norma e rregullimit të kategorive për problemet > 4 javë"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -539,7 +581,7 @@ msgstr "Norma e rregullimit të kategorive për problemet > 4 javë"
 msgid "Category:"
 msgstr "Kategoria:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategoria: %s"
 
@@ -608,10 +650,14 @@ msgstr ""
 "Zgjidhni një emër të<strong> kategorisë </ strong> emër që ka kuptim për publikun (p.sh., \"\", \"ndriçimi publik\",\"Rruga Lokale\"), por është i kuptueshëm edhe për\n"
 "Drejtorinë. Këto do të shfaqen në drop-down menynë në faqen Raportimit të problemeve."
 
-#: templates/web/base/report/_inspect.html:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -642,10 +688,12 @@ msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur."
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -653,11 +701,11 @@ msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur."
 msgid "Closed"
 msgstr "Mbyllur"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Mbyllur nga këshilli."
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "Raporte të mbyllura"
 
@@ -683,6 +731,11 @@ msgstr ""
 msgid "Cobrand:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Harta të përdorura"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -746,8 +799,8 @@ msgstr "Kontakto ekipin"
 msgid "Coordinates:"
 msgstr "Koordinatat:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Nuk mund te gjeni perdoruesin"
 
@@ -765,6 +818,36 @@ msgstr "Këshilli"
 msgid "Council contacts for %s"
 msgstr "Kontaktet e kuvendit për %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "shenuar si i mbyllur"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "shenuar si i rregulluar"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "shenuar si ne progres"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "shenuar si i shqyrtuar"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "shenuar si i planifikuar"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr ""
@@ -789,15 +872,15 @@ msgstr "Krijo nje raport"
 msgid "Create category"
 msgstr "Krijo kategorine"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "Krijo prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr "Krijo raporte/përditësime si Kuvend Komunal"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr "Krijo raport/përditësim në emër të shfrytëzuesit"
 
@@ -841,7 +924,11 @@ msgstr "Paneli"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Trajtohet nga nën-drejtoritë brenda 5 ditëve të punës"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -855,6 +942,11 @@ msgstr "Fshije template"
 msgid "Deleted"
 msgstr "E fshirë"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -891,6 +983,12 @@ msgstr "Nuk e përdori hartën"
 msgid "Diligency prize league table"
 msgstr ""
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Ruaj ndryshimet"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "Mos dërgo notifikime me email ne komentet e marra nga lajmëruesi i problemit"
@@ -916,23 +1014,25 @@ msgstr "Nuk i'u pelqen kjo forme?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Merr dhe lësho fotot këtu ose <u>kliko për të ngarkuar foto</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Dyfisho"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Dyfisho"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Dyfisho"
@@ -948,8 +1048,8 @@ msgstr ""
 "kategoritë të ndryshme <strong> mund të kenë të njëjtin kontakt </ strong> (adresë e-mail).\n"
 "Kjo do të thotë që ju mund të shtoni shumë kategori edhe në qoftë se ju keni vetëm një kontakt për llojin e problemit"
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr "Lëvizje drejtë Lindjes/Veriut:"
 
@@ -963,28 +1063,28 @@ msgid "Edit"
 msgstr "Përditëso"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Përditëso detajet:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "Përditëso detajet e përdoruesit"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "Përditëso autorizimet e përdoruesit"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "Përditëso kategorinë e raporteve"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "Përditëso prioritetin e raportit"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "Përditëso raportet"
 
@@ -1023,7 +1123,7 @@ msgstr "Editor"
 msgid "Email"
 msgstr "Email"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Emaili u shtua te lista e abuzimeve"
 
@@ -1041,7 +1141,7 @@ msgstr "Notifikimi me email u krijua"
 msgid "Email alert deleted"
 msgstr "Notifikimi me email u fshi"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Emaili tanimë është në listë e abuzuesve"
 
@@ -1086,7 +1186,7 @@ msgstr "Pika e fundit"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Shkruaj një Z&uuml;rich emër të rrugës "
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Shkruani një emër të rrugës apo zonë."
 
@@ -1120,8 +1220,8 @@ msgstr "Pershkruaje problemin"
 msgid "Error"
 msgstr "Gabim"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Çdo gjë"
 
@@ -1135,14 +1235,23 @@ msgid "Examples:"
 msgstr "Shembuj:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "Kategori ekzistuese"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Shpjego çfarë është gabim"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Të gjitha raportet si CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1151,6 +1260,7 @@ msgid "Extern"
 msgstr "i jashtëm"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "ID e jashtme"
 
@@ -1171,8 +1281,8 @@ msgstr "Ekipi i jashtëm"
 msgid "Extra data:"
 msgstr "Te dhena shtese:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "Ekstra detajet"
 
@@ -1197,10 +1307,12 @@ msgstr "Rregulloni këtë duke zgjedhur një <strong> zonë të mbuluar </ stron
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1208,6 +1320,8 @@ msgstr "E rregulluar"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "E rregulluar - Këshilli"
 
@@ -1216,7 +1330,7 @@ msgstr "E rregulluar - Këshilli"
 msgid "Fixed - User"
 msgstr "E rregulluar - Perdoruesi"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "Raportimet që janë rregulluar"
 
@@ -1225,7 +1339,7 @@ msgid "Fixed:"
 msgstr "E rregulluar:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "E fshirë"
@@ -1311,11 +1425,13 @@ msgstr "Me jep mua nje RSS feed"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Jemi të kënaqur që është regulluar!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Vazhdo"
@@ -1324,11 +1440,11 @@ msgstr "Vazhdo"
 msgid "Going to send questionnaire?"
 msgstr "Do dërgoni pyetsorin?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "Lejoni akses për administratorin"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Grafi i problemeve të krijuara në bazë të statusit gjatë kohës"
 
@@ -1344,7 +1460,7 @@ msgstr "A ka qene i rregulluar ky problem?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "A keni raportuar ndonjë problem më herët për këshillin apo kjo është hera e parë?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1369,6 +1485,9 @@ msgstr "Pershendetje %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1376,6 +1495,11 @@ msgstr "Pershendetje %s"
 msgid "Hidden"
 msgstr "E fshehur"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Ridergo raportin"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Fshih të vjetrat"
@@ -1384,6 +1508,10 @@ msgstr "Fshih të vjetrat"
 msgid "Hide pins"
 msgstr "Fshih shenjën"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historia"
@@ -1415,7 +1543,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1433,6 +1561,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1443,7 +1575,7 @@ msgstr ""
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Nëse merrni më shumë informata për gjendjën e problemit tuaj, ju lutem kthehuni në faqe dhe leni një përditësim."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 "Nëse ju dëshironi vetëm  që ky prioritet të jetë një alternativë për kategori të veçanta, merr ato këtu. By default ata do të tregojnë për të gjitha kategoritë"
 
@@ -1503,8 +1635,8 @@ msgstr "ID ilegale"
 msgid "Illegal feed selection"
 msgstr "zgjedhje e gabuar e feed"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1522,7 +1654,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1540,7 +1674,7 @@ msgstr "Perfshire te dhenat personale te raportuesit"
 msgid "Include unconfirmed reports"
 msgstr "Perfshire raportimet e pakonfirmuara"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Gabim ka_foto value \"%s\""
 
@@ -1548,7 +1682,7 @@ msgstr "Gabim ka_foto value \"%s\""
 msgid "Inspection required"
 msgstr "Inspektimi kërkohet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "Instrukto kontraktorët të rregullojnë problemet"
 
@@ -1558,33 +1692,41 @@ msgstr "Shenim i brendshem"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Rekomandim i brendshem"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Vlerë agency_responsible e gabuar %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Data e fundit jovalide"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Format jo i vlefshëm %s i specifikuar."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr "Lokacion jo valid. Lokacioni i ri duhet të mbulohet nga i njëjti këshill."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Data e fillimit jovalide"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1617,6 +1759,15 @@ msgstr "Juridiksion i pa njohur"
 msgid "Keep me signed in on this computer"
 msgstr "Më mbaj të kyqur në këtë kompjuter"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Perditesimi i fundit:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1630,11 +1781,12 @@ msgstr "Perditesimi i fundit:"
 msgid "Last&nbsp;update:"
 msgstr "Perditesimi&nbsp;fundit:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr "I përditësuar kohët e fundit"
 
@@ -1642,6 +1794,10 @@ msgstr "I përditësuar kohët e fundit"
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Lini bosh këtë në qoftë se të gjitha raportet në këtë organ duhet të dërgohen duke përdorur të njëjtën metodë të dërgimit (p.sh., \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Listo te gjitha problemet e raportuar"
@@ -1663,7 +1819,8 @@ msgstr ""
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr ""
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Njoftimet lokale"
 
@@ -1671,15 +1828,36 @@ msgstr "Njoftimet lokale"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokalizo problemin në hartë në vendin e caktuar"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "HARTA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr "Menaxhoni listën e shkurtë"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1703,7 +1881,7 @@ msgstr "Shëno si të rregulluar/mbyllyr në 8 javët e kaluara"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Shëno si të rregulluar/mbyllyr në më shumë se 8 javë"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1723,7 +1901,7 @@ msgstr "Mesazh për një drejtori të jashtme"
 msgid "Missing bodies:"
 msgstr "Mungojnë drejtori:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Mungesë juridiksioni_id"
 
@@ -1731,7 +1909,7 @@ msgstr "Mungesë juridiksioni_id"
 msgid "Moderate"
 msgstr "Mesatare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr "Raportet e detajuara mesatare"
 
@@ -1739,15 +1917,32 @@ msgstr "Raportet e detajuara mesatare"
 msgid "Moderate this report"
 msgstr "Moderoni këtë raport"
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Moderoni këtë raport"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Raportuar nga %s ne %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Moderuar me divizion brenda një ditë pune"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "Moderoni këtë raport"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Muaji"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "Më të komentuarat"
 
@@ -1755,7 +1950,7 @@ msgstr "Më të komentuarat"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1783,7 +1978,7 @@ msgstr "Emri:"
 msgid "Name: %s"
 msgstr "Emri: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr "Shko tek ky problem"
 
@@ -1792,7 +1987,7 @@ msgstr "Shko tek ky problem"
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Rruga më e afërt me emërtim e llogaritur nga pin në hartë (gjenerohet automatikisht duke përdorur OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Kodi postar më i afërt  nga pin i vendosur në hartë (gjenerohet automatikisht): %s (%sm jasht)"
 
@@ -1801,7 +1996,7 @@ msgstr "Kodi postar më i afërt  nga pin i vendosur në hartë (gjenerohet auto
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr "Rruga më e afërt e llogaritur nga pin në hartë (gjenerohet automatikisht nga Bing Maps): %s"
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1883,7 +2078,7 @@ msgstr "Gjendje e re"
 msgid "New template"
 msgstr "Shabllon i ri"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "Më e reja"
 
@@ -1891,6 +2086,7 @@ msgstr "Më e reja"
 msgid "Next"
 msgstr "Tjetra"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1919,7 +2115,7 @@ msgstr "Ska drejtori"
 msgid "No council"
 msgstr "Ska council"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Asnjë council  e zgjedhur"
 
@@ -1937,6 +2133,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1947,6 +2145,14 @@ msgstr "E pamundur të zgjidhet"
 msgid "No further updates"
 msgstr "nuk ka perditesime tjera"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Nuk u kthye asnje rezultat"
@@ -1987,6 +2193,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2048,6 +2256,14 @@ msgstr "Tani ju mund te paraqitni perditesimin&hellip;"
 msgid "OK"
 msgstr "Ne rregull"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Te vjetra/probleme  <br> te panjohura"
@@ -2064,7 +2280,7 @@ msgstr "E vjeter <br>e kryer"
 msgid "Older <br>problems"
 msgstr "Probleme <br> te vjetra"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "Më i vjetri"
 
@@ -2074,7 +2290,10 @@ msgstr "Më i vjetri"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2118,15 +2337,15 @@ msgstr "Ose raportoni problemet n:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Tjera"
 
@@ -2161,11 +2380,11 @@ msgstr "Fjalekalimi (opsionale)"
 msgid "Password:"
 msgstr "Fjalekalimi:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "Lejet"
 
@@ -2232,8 +2451,8 @@ msgstr "Vendose shenjen ne harte"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2259,14 +2478,14 @@ msgid "Please check your email address is correct"
 msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Ju lutem zgjedhni kategorine"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Ju lutem zgjedhni tipin e pronës"
 
@@ -2292,8 +2511,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Ju lutem shkruaj nje mesazh"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Ju lutem shkruani emrin"
 
@@ -2308,13 +2527,13 @@ msgid "Please enter a password"
 msgstr "Ju lutem shkruaj fjalekalimin"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Ju lutem shkruaj subjektin"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2327,7 +2546,7 @@ msgstr "Ju lutem shkruaj nje email valid"
 msgid "Please enter a valid email address"
 msgstr "Ju lutem shkruani një email adresë valide"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Ju lutem shkruaj disa te dhena"
@@ -2354,14 +2573,14 @@ msgstr "Ju lutem shkruani email adresen tuaj"
 msgid "Please enter your first name"
 msgstr "Ju lutem shkruani emrin tuaj"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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 lutem shkruani emrin tuaj të plotë, council i cili kërkon këtë informatë - nëse nuk doni që emri juaj të shihet në faqe, largoni etiketimin nga kutia e mëposhtme"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2424,7 +2643,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Ju lutem vini re:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr "Ju lutem sigorni një përditësim publik për këtë raport"
 
@@ -2457,10 +2676,10 @@ msgstr ""
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ju lutem tregoni nëse problemi është zgjedhur apo jo "
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Ju lutem ngarkoni vetëm një fotografi"
 
@@ -2483,15 +2702,15 @@ msgstr "Posto"
 msgid "Posted anonymously at %s"
 msgstr "Postuar ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Postuar nga %s ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postuar nga  <strong>%s</strong> (%s) ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postuar nga  <strong>%s</strong> ne %s"
 
@@ -2507,12 +2726,12 @@ msgstr "Paraprak"
 msgid "Priorities"
 msgstr "Prioritetet"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Privatësi"
 
@@ -2555,7 +2774,7 @@ msgstr "Problemi %s është dërguar tek council %s"
 msgid "Problem breakdown by state"
 msgstr "Nën-ndarja me shtete"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problemi eshte shenuar si i hapur."
 
@@ -2563,7 +2782,7 @@ msgstr "Problemi eshte shenuar si i hapur."
 msgid "Problem state change based on survey results"
 msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problemet"
@@ -2584,13 +2803,13 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problemet brenda %.1fkm te ketij lokacioni"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problemet brenda %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problemet brenda lagjes %s"
 
@@ -2636,7 +2855,7 @@ msgstr "Përditësim publik."
 msgid "Public response:"
 msgstr "Pergjigje publike:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr "Përditësim publik."
 
@@ -2672,11 +2891,11 @@ msgstr "Pyestor i plotësuar nga raportuesi i problemit"
 msgid "RSS feed"
 msgstr "RSS feed"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS feed per %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS feed per lagjen %s , %s"
 
@@ -2684,11 +2903,11 @@ msgstr "RSS feed per lagjen %s , %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS feed i %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS feed i %s, brenda lagjes %s"
 
@@ -2696,13 +2915,13 @@ msgstr "RSS feed i %s, brenda lagjes %s"
 msgid "RSS feed of nearby problems"
 msgstr "RSS feed i problemeve ne afersi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS feed i problemeve brenda %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS feed i problemeve brenda lagjes %s "
 
@@ -2721,7 +2940,7 @@ msgstr "RSS feed per te rejat rreth ketij problemi"
 msgid "Receive email when updates are left on this problem."
 msgstr "Prano email kur ka perditesime te ketij problemi"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr "Pranuar nga  momente më vonë"
 
@@ -2739,7 +2958,7 @@ msgstr "Rregullimet <br> e fundit"
 msgid "Recently reported problems"
 msgstr "Problemet e raportuara së fundmi"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr "Përditësuar së fundmi"
 
@@ -2778,12 +2997,12 @@ msgid "Report"
 msgstr "Raporto"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "ID e raportit:"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Raporto nje problem"
@@ -2801,6 +3020,11 @@ msgstr "Raporto si"
 msgid "Report on %s"
 msgstr "Raporto ne %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Raporto si"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2812,7 +3036,7 @@ msgstr "Raportoni problemin tuaj"
 msgid "Report, view, or discuss local problems"
 msgstr "Raporto,shiqo apo diskuto problemet lokale"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Raportuar ne menyre anonime te %s"
@@ -2822,7 +3046,7 @@ msgstr "Raportuar ne menyre anonime te %s"
 msgid "Reported before"
 msgstr "Të raportuara më parë"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Raportuar nga %s ne %s"
@@ -2836,27 +3060,27 @@ msgstr "Raportuar nga:"
 msgid "Reported in the %s category"
 msgstr "Raportuar ne kategorine %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Raportuar ne kategorine %s nga %s ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Raportuar nepermjet %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Raportuar nepermjet %s nga %s ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Raportuar nepermjet %s ne kategorine %s ne %s"
 
@@ -2880,11 +3104,12 @@ msgstr "Raportimi i nje problemi"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Raportimet"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Raportimet jane te kufizuara ne gjatesine %s karaktere. Ju lutem shkurtoje raportin tuaj"
 
@@ -2892,10 +3117,6 @@ msgstr "Raportimet jane te kufizuara ne gjatesine %s karaktere. Ju lutem shkurto
 msgid "Reports awaiting approval"
 msgstr "Raporti është duke pritur për aprovim"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr "Raportet nga përdoruesit me reputacion të lartë dhe të mjaftueshëm do të dërgohen menjëherë pa kërkuar inspektimin e mëtutjeshëm. Pragu i çdo kategorie mund të menaxhohet në faqen e saj të redaktimit. Përdoruesit fitojnë reputacion kur një raport që kanë bërë është shënuar si i kontrolluar nga inspektorët."
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr "Raportet e bëra nga përdoruesit e besueshëm do të dërgohen tek drejtoria përgjegjëse pa u kontrolluar më parë."
@@ -2904,7 +3125,12 @@ msgstr "Raportet e bëra nga përdoruesit e besueshëm do të dërgohen tek drej
 msgid "Reports published"
 msgstr "Raporti u publikua"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Raporto nje problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr "Raportet duke pritur për tu dërguar"
 
@@ -2916,10 +3142,6 @@ msgstr "Raportet automatikisht do të dërgohen pa nevojë për tu kontrolluar n
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr "Reputacioni:"
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Ridergo raportin"
@@ -2951,6 +3173,18 @@ msgstr "Shabllonet e përgjigjeve"
 msgid "Response Templates for %s"
 msgstr "Shabllone të përgjigjjeve për"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2966,15 +3200,15 @@ msgstr "Operatori i rrugës për emrin e kësaj rruge  (rrjedh nga numri i refer
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Operatori i rrugës për emrin e kësaj rruge (nga OpenStreetMap)."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2986,36 +3220,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rrotullimi i kësaj foto do të heq dorë nga ndryshimet e paruajtura në raport."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satelitore"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "shenuar si raport i dyfishuar"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Ruaj ndryshimet"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr "Ruaje me një përditësim për publikun"
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Kërko Raportet"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Kerko Perdoruesit"
 
@@ -3042,7 +3284,7 @@ msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues."
 msgid "See our privacy policy"
 msgstr "Shiqo rregulloren tonë të privatësisë"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 #, fuzzy
 msgid "See user detail for reports created as the council"
 msgstr "Krijo raporte/përditësime si Kuvend Komunal"
@@ -3077,7 +3319,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "Dërgo raportin prapa"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Dërgo tek %s %s më vonë"
 
@@ -3090,7 +3332,7 @@ msgstr "Dërgo:"
 msgid "Service:"
 msgstr "Shërbim:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr "Vendos tek lokacioni im i tanishëm"
 
@@ -3098,6 +3340,7 @@ msgstr "Vendos tek lokacioni im i tanishëm"
 msgid "Share"
 msgstr "Shpërndajë"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3107,6 +3350,7 @@ msgstr "Lista e ngushtë"
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr "Përzgjedhur"
 
@@ -3114,23 +3358,43 @@ msgstr "Përzgjedhur"
 msgid "Shortlisted by %s"
 msgstr "Përzgjedhur nga %s"
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Shfaq te vjetrat"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Publiko emrin tim"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Publiko emrin tim"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Shfaq te vjetrat"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Shfaq te vjetrat"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Shfaq shenjat"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3170,7 +3434,7 @@ msgstr "Disa foto nga raportet më të fundit"
 msgid "Some text to localize"
 msgstr "Teksti për të lokalizuar"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "Na falni, ky  duhet të jetë Crown kod postar i pavarur, të cilin ne nuk e mbulojmë."
 
@@ -3201,15 +3465,21 @@ msgstr "Na vjen keq, ne nuk mund të hyni. Ju lutemi plotësoni formularin e më
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Na vjen keq, ne nuk mund të ruajmë imazhin(et) tuaj, ju lutem provoni përsëri."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr "Na vjen keq, ju nuk keni leje për të bërë atë."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr "Ndaj sipas"
 
@@ -3227,12 +3497,12 @@ msgstr "Data e Fillimit:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Gjendje"
@@ -3248,7 +3518,7 @@ msgstr "Gjendje:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3269,7 +3539,7 @@ msgstr "Akoma hapur, nepermjet pyetesorit, %s"
 msgid "Street View"
 msgstr "Pamje e rrugës"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Nenkategoria: %s"
 
@@ -3297,7 +3567,7 @@ msgstr "Dërgo"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3354,11 +3624,11 @@ msgstr "Permbledhje"
 msgid "Summary reports"
 msgstr "Raportet përmbledhëse"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr "Superpërdorues:"
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr "Superpërdorues keni leje për të kryer <strong> të gjitha veprimet </ strong> brenda adminit."
 
@@ -3421,7 +3691,7 @@ msgstr "Faleminderit që ngarkuat fotografinë tuaj. Tani duhet  të lokalizojm
 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 "Faleminderit, është knaqësi të dëgjojmë që është rregulluar. A mund të dimë nëse keni raportuar ndonjë problem në ndonjë drejtori më herët?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Duket se imazhi nuk është ngarkuar si duhet (%s), ju lutem provoni përsëri."
 
@@ -3435,7 +3705,7 @@ msgstr "Ai vend nuk duket të jetë në Kosovë; ju lutem provoni përsëri."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Kodi postar nuk u njoh, na vjeqn keq."
 
@@ -3601,7 +3871,7 @@ msgstr "Ka problem në hapjën e faqes Të gjitha raportet. Ju lutem provoni pë
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Ka probleme në hapjën e kësaj faqe. Ju lutem provoni përsëri më vonë."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3680,18 +3950,18 @@ msgstr ""
 "Kjo Drejtori do të pranojë vetëm raporte për probleme që janë të vendosura në <strong> zonën e mbuluar </ strong> .\n"
 "Një drejtori nuk do të marrë ndonjë raport vetëm  nëse ajo mbulon të paktën një zonë atëherë do të pranojë një raport."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Ky email është dërguar të dy Drejtorite që mbulojnë vendndodhjen e problemit, pasi përdoruesi nuk e kategorizoj atë; ju lutemi të injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje, ose na tregoni se çfarë kategorie e problemit është kjo kështu që ne mund të shtojmë atë në sistemin tonë."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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 email është dërguar në disa Drejtori që mbulojnë vendndodhjen e problemit, pasi që kategoria e zgjedhur është dhënë për të gjithë ata; ju lutemi ta injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Ky informacion është i nevojshëm"
 
@@ -3707,14 +3977,19 @@ msgstr "Kjo është një përmbledhje e të gjitha raporteve në këtë faqe."
 msgid "This pothole has been here for two months and…"
 msgstr "Kjo gropë ka qenë këtu për dy muaj dhe ..."
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Ky problem ka qene i rregulluar"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Ky problem nuk ka qene i rregulluar"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Ky problem nuk ka qene i rregulluar"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3762,7 +4037,7 @@ msgid "Tips for perfect photos"
 msgstr "Këshilla për foto sa më të mira"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3793,8 +4068,26 @@ msgstr "Për të parë një hartë të vendndodhjen e saktë të kësaj çështj
 msgid "Total"
 msgstr "Total"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "shenuar si i rregulluar"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr "Menaxhimi i trafikut i nevojshëm?"
 
@@ -3802,7 +4095,7 @@ msgstr "Menaxhimi i trafikut i nevojshëm?"
 msgid "Trusted by bodies:"
 msgstr "Të besuar nga Drejtoritë:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "I besuar për të bërë raporte të cilat nuk duhet të kontrollhen"
 
@@ -3827,7 +4120,8 @@ msgstr "Provoni për të na shkruar email direkt:"
 msgid "Unconfirmed"
 msgstr "E pakonfirmuar"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "Raportime të pa zgjidhura"
 
@@ -3851,6 +4145,11 @@ msgstr "Gabim i panjohur"
 msgid "Unknown problem ID"
 msgstr "ID problemi i panjohur"
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Përzgjedhur"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3907,10 +4206,10 @@ msgstr ""
 msgid "Updated"
 msgstr "Perditesuar"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3954,26 +4253,32 @@ msgstr "Harta të përdorura"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Flamuri i përdoruesit është hequr"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "shenuar si i rregulluar"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Përdoruesi gjen përputhje në kërkimet e emrit të përdoruesit dhe email adresës."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Perdoruesit"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr "Përdoruesit mund të ndërmarrin hapat brenda drejtorisë apo fushës së tyre të dedikuar."
 
@@ -4004,6 +4309,15 @@ msgstr "Duke parë lokacionin"
 msgid "Viewing a problem"
 msgstr "Duke parë problemin"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr ""
@@ -4023,7 +4337,7 @@ msgstr "Ne kemi gjetur më shumë se një përputhje për referencën e problemi
 msgid "We need your email address, please give it below."
 msgstr "Na nevojitet email adresa juaj, ju lutemi shkruajeni më poshtë"
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Ne kuptojmë që ky problem mund të jetë përgjegjësi e  pavarësisht ne nuk kemi ndonjë detaj kontaktues për ta. Por nese ju dini ndonjë kontakt adresë të përshtatshme, ju lutem kontaktoni."
 
@@ -4040,6 +4354,10 @@ msgstr "Ne do të përdorim të dhënat tuaja personale në përputhje me rregul
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Na vjen eq qe problemi nuk është rregulluar. Pse nuk provoni të ju shkruani përfaqësuesve tuaj lokal?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Do të ju përgjigjemi sa më shpejtë që mundemi."
@@ -4057,11 +4375,11 @@ msgstr "Kur redaktohet"
 msgid "When sent"
 msgstr "Kur është dërguar"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Whoa Testino ! Tre foto janë të mjaftueshme."
 
@@ -4096,10 +4414,16 @@ msgstr "Nëse shkruani mesazhin tuaj me shkronja të mëdha është e vështirë
 msgid "Wrong location? Just click again on the map."
 msgstr "Lokacion i gabuar? Vetëm klikoni përsëri në hartë."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Viti"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4128,6 +4452,10 @@ msgstr "Po une kam nje fjalekalim"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 ""
@@ -4171,6 +4499,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Ju anuluat; ju lutem plotësoni kutinë më lartë "
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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 ""
@@ -4229,7 +4561,7 @@ msgid "Your Reports"
 msgstr "Raportet tuaja"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Llogaria juaj"
 
@@ -4266,6 +4598,11 @@ msgstr "Informatat tuaja do të përdoren në përputhje me politikën tonë të
 msgid "Your name"
 msgstr "Emri juaj"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Raportet tuaja"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4295,6 +4632,10 @@ msgstr "Raportet tuaja"
 msgid "Your shortlist"
 msgstr "Lista juaj e shkurtë"
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Perditesimet tuaja"
@@ -4305,7 +4646,7 @@ msgid "Yourself"
 msgstr "Vetëvetja"
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "Të gjitha"
 
@@ -4313,7 +4654,7 @@ msgstr "Të gjitha"
 msgid "by %s"
 msgstr "nga %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "shenuar si raport i dyfishuar"
 
@@ -4341,49 +4682,49 @@ msgstr "Ndryshoni përdoruesin"
 msgid "from %s different users"
 msgstr "nga %s perdorues te ndryshem"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "Perditesimi i fundit %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "më pak se një minutë"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "shenuar si veprim i planifikuar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "shenuar si nje rekomandim i brendshem"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "shenuar si i mbyllur"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "shenuar si i rregulluar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "shenuar si ne progres"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "shenuar si i shqyrtuar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "Etiketuar si e pamundur për ta rregulluar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "shenuar si i planifikuar"
 
@@ -4394,7 +4735,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr "asnjë"
 
@@ -4429,8 +4770,8 @@ msgstr "E dhënë origjinale"
 msgid "other areas:"
 msgstr "zona tjera:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "rihapur"
 
@@ -4451,7 +4792,7 @@ msgstr "lokal council"
 msgid "there is no pin shown as the user did not use the map"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "ky lloj i problemit lokal"
 
@@ -4459,6 +4800,16 @@ msgstr "ky lloj i problemit lokal"
 msgid "today"
 msgstr "sot"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Perditesim"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Perditesime"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "harta e përdorur"
@@ -4476,27 +4827,41 @@ msgstr "perdoruesi eshte shkaktar i problemit"
 msgid "ward"
 msgstr "lagje"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "Email adresa"
+msgstr[1] "Email adresa"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ditë"
 msgstr[1] "%d dit"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d orë"
 msgstr[1] "%d orë"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutë"
 msgstr[1] "%d minuta"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minutë"
+msgstr[1] "%d minuta"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4504,13 +4869,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d perkrahes"
 msgstr[1] "%d perkrahes"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d javë"
 msgstr[1] "%d javë"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4539,6 +4911,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> perditesim ne raporte"
 msgstr[1] "<big>%s</big> perditesime ne raporte"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Raportuar nga %s ne %s"
+msgstr[1] "Raportuar nga %s ne %s"
+
 #: 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."
@@ -4553,5 +4932,49 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "Perditesimi i fundit %s"
+msgstr[1] "Perditesimi i fundit %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Raporto"
+msgstr[1] "Raporto"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Të gjitha kategoritë"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "ID e jashtme"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "Inspektimi kërkohet"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Përditëso kategorinë e raporteve"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Raportuar nga %s ne %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "Perditesimi i fundit %s"
+
+#~ msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
+#~ msgstr "Raportet nga përdoruesit me reputacion të lartë dhe të mjaftueshëm do të dërgohen menjëherë pa kërkuar inspektimin e mëtutjeshëm. Pragu i çdo kategorie mund të menaxhohet në faqen e saj të redaktimit. Përdoruesit fitojnë reputacion kur një raport që kanë bërë është shënuar si i kontrolluar nga inspektorët."
+
+#~ msgid "Reputation:"
+#~ msgstr "Reputacioni:"
+
 #~ msgid "Cancel"
 #~ msgstr "Anulo"
diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 66098021b..f5e7f9d92 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jon Kristensen <info@jonkri.com>, 2016\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr " och "
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr "%s skickar olika kategorier av rapporter till olika enheter inom en kommun eller län. Problem som rapporteras inom en viss kommun dyker därför inte nödvändigtvis upp i listan över rapporter till den kommunen. Exempelvis kan en rapport om en väg skickas till Vägverket snarare än kommunen. Rapporten dyker då inte upp i listan över rapporter till kommunen, men dyker upp om man söker alla rapporter inom ett visst avstånd."
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "Administrativa området %s, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s inom det administrativa området %s"
 
@@ -154,7 +154,7 @@ msgstr "(fixad)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(ej skickat till kommunen)"
 
@@ -162,17 +162,17 @@ msgstr "(ej skickat till kommunen)"
 msgid "(optional)"
 msgstr "(valfritt)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(skickat till båda)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Välj en katagori --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Välj en fastighetstyp --"
 
@@ -184,6 +184,14 @@ msgstr "--Välj en mall--"
 msgid "10 inch pothole on Example St, near post box"
 msgstr "Hål i gatan på Storgatan, nära brevlådan"
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "              Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.<br>\n"
 "              Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">Visa</label> %s <label for=\"filter_categories\">om</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Nej</strong> Låt mig bekräfta uppdateringen via epost"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Nej</strong> Låt mig logga in med min epostadress"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras."
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr "<strong>Notera:</strong> Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras."
 
@@ -235,6 +251,8 @@ msgstr "<strong>Ja</strong>, jag har ett lösenord"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,15 +295,15 @@ msgstr "Lägg till i slutlista"
 msgid "Add user"
 msgstr "Lägg till användare"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr "Lägg till eller ta bort problemkategorier"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr "Lägg till eller ta bort svarsprioriteringar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr "Lägg till eller ta bort svarsmallar"
 
@@ -297,6 +315,10 @@ msgstr "Lades till %s"
 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."
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Igen:"
@@ -313,6 +335,13 @@ msgstr "Bevakning %d avaktiverad (skapad %s)"
 msgid "Alert me to future updates"
 msgstr "Varsko mig om framtida uppdateringar"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+#, fuzzy
+msgid "All"
+msgstr "samtliga"
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -322,12 +351,14 @@ msgstr "Alla rapporter"
 msgid "All Reports as CSV"
 msgstr "Alla rapporter som CSV"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr "Samtliga kategorier"
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -362,11 +393,12 @@ msgstr "Annan användare"
 msgid "Are you a developer?"
 msgstr "Är du en utvecklare?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr "Är du säker på att du vill avbryta den här uppladdningen?"
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr "Är du säker?"
@@ -403,7 +435,7 @@ msgstr "Tilldela extern förvaltning:"
 msgid "Assign to subdivision:"
 msgstr "Tilldela underavdelning:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr "Tilldela användare till områden"
 
@@ -429,15 +461,23 @@ msgid "Auto-response:"
 msgstr "Autosvar:"
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr "Tillgängliga kategorier"
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr "Undvik personlig information och nummerplåtar"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Väntar på att granskas"
@@ -455,7 +495,7 @@ msgid "Ban email address"
 msgstr "Förbjud epostadress"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -464,7 +504,7 @@ msgid "Bodies"
 msgstr "Förvaltningar"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -492,14 +532,15 @@ msgid "Categories"
 msgstr "Kategorier"
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr "Kategorier:"
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -510,7 +551,7 @@ msgstr "Kategorier:"
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr "Kategori ändrat från ‘%s’ till ‘%s’"
 
@@ -520,6 +561,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -527,7 +569,7 @@ msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -584,10 +626,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -618,10 +664,12 @@ msgstr "Klicka på länken i vårt bekräftelsemail för att logga in."
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -629,11 +677,11 @@ msgstr "Klicka på länken i vårt bekräftelsemail för att logga in."
 msgid "Closed"
 msgstr "Stängd"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Stängd av kommunen"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "stängda rapporter"
 
@@ -659,6 +707,11 @@ msgstr "Cobrand data:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "Använde kartan"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -722,8 +775,8 @@ msgstr "Kontakta teamet"
 msgid "Coordinates:"
 msgstr "Koordinater:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kan inte hitta användaren"
 
@@ -741,6 +794,36 @@ msgstr "Kommun"
 msgid "Council contacts for %s"
 msgstr "Kommunkontakter för %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "markerad som stängd"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "markerad som löst"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "markerad som pågående"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "markerad som under utredning"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "markerad som planerad"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "kommunens referens:&nbsp;%s"
@@ -765,15 +848,15 @@ msgstr "Skapa en rapport"
 msgid "Create category"
 msgstr "Skapa en kategori"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr "Skapa prioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr "Skapa rapporter/uppdateringar som kommunen"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr "Skapa rapporter/uppdateringar på en användares vägnar"
 
@@ -817,7 +900,11 @@ msgstr "Skrivbord"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Hanterat av underavdelning inom 5 arbetsdagar"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -831,6 +918,11 @@ msgstr "Ta bort mall"
 msgid "Deleted"
 msgstr "Borttagen"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -867,6 +959,12 @@ msgstr "Använde inte kartan"
 msgid "Diligency prize league table"
 msgstr "Flitighetstopplistan"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Spara ändringar"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr "Skicka inte e-postnotifikationer kring hämtade kommentarer till problemrapportens skapare"
@@ -892,23 +990,25 @@ msgstr "Gillar du inte formulär?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr "Släpp foton här eller  <u>klicka för att ladda upp</u>"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Finns redan"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Finns redan"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Finns redan"
@@ -921,8 +1021,8 @@ 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/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr "Easting/Northing:"
 
@@ -936,28 +1036,28 @@ msgid "Edit"
 msgstr "Ändra"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Ändra förvaltningsdetaljer"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr "Redigera andra användares uppgifter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr "Redigera andra användares rättigheter"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr "Redigera rapportkategori"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr "Redigera rapportprioritet"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr "Redigera rapporter"
 
@@ -996,7 +1096,7 @@ msgstr "Redaktör"
 msgid "Email"
 msgstr "Epost"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Epostadressen tillagd till missbrukslistan"
 
@@ -1014,7 +1114,7 @@ msgstr "E-postnotifikation skapad"
 msgid "Email alert deleted"
 msgstr "E-postnotifikation borttagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Epostadressen finns redan i missbrukslistan"
 
@@ -1062,7 +1162,7 @@ msgstr "Ändpunkt"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Skriv in ett Z&uuml;rich-gatunamn"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Ange ett postnummer eller gatunamn och ort"
 
@@ -1096,8 +1196,8 @@ msgstr "Skriv in information om problemet"
 msgid "Error"
 msgstr "Fel"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "Allt"
 
@@ -1111,14 +1211,23 @@ msgid "Examples:"
 msgstr "Exempel:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr "Befintlig kategori"
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Förklara felet"
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Alla rapporter som CSV"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1127,6 +1236,7 @@ msgid "Extern"
 msgstr "Extern"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr "Externt ID"
 
@@ -1147,8 +1257,8 @@ msgstr "Externt arbetslag"
 msgid "Extra data:"
 msgstr "Extra data:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr "Extra uppgifter"
 
@@ -1173,10 +1283,12 @@ msgstr "Lös detta genom att välja ett <strong>lämpligt område</strong> i <em
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1184,6 +1296,8 @@ msgstr "Löst"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Löst - Kommun"
 
@@ -1192,7 +1306,7 @@ msgstr "Löst - Kommun"
 msgid "Fixed - User"
 msgstr "Löst - Användare"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "lösta rapporter"
 
@@ -1201,7 +1315,7 @@ msgid "Fixed:"
 msgstr "Löst:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Flagga som borttagen"
@@ -1287,11 +1401,13 @@ msgstr "Ge mig ett RSS-flöde"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Vi är glada att höra att det har blivit löst!"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Gå"
@@ -1300,11 +1416,11 @@ msgstr "Gå"
 msgid "Going to send questionnaire?"
 msgstr "Skicka enkät?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr "Bevilja tillgång till administratörskontrollpanelen"
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Visualisering av rapporter över tid"
 
@@ -1320,7 +1436,7 @@ msgstr "Har det här problemet blivit löst?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Har du någonsin rapporterat ett problem till en kommun tidigare eller är det här första gången?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1345,6 +1461,9 @@ msgstr "Hej %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1352,6 +1471,11 @@ msgstr "Hej %s"
 msgid "Hidden"
 msgstr "Gömd"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Skicka om rapporten"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Göm äldre"
@@ -1360,6 +1484,10 @@ msgstr "Göm äldre"
 msgid "Hide pins"
 msgstr "Göm kartnålar"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Historik"
@@ -1391,7 +1519,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1409,6 +1537,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr "Identifiera en <strong>förälder</strong> om den här förvaltningen är en del av en annan förvaltning. Den här typen av kopplingar behövs inte göras i enklare installationer."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1419,7 +1551,7 @@ msgstr "Om två eller fler förvaltningar delar på ett geografiskt område, kom
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Om du får mer information om problemets status får du gärna komma tillbaka hit och lämna en uppdatering."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 "Om du bara vill att den här prioriteringen skall vara valbar för specifika kategorier, välj då dessa här. Som standard visas den för samtliga kategorier."
 
@@ -1477,8 +1609,8 @@ msgstr "Ogiltigt ID"
 msgid "Illegal feed selection"
 msgstr "Ogiltigt RSS-flöde"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1496,7 +1628,9 @@ msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikat
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1514,7 +1648,7 @@ msgstr "Inkludera rapportörens personuppgifter"
 msgid "Include unconfirmed reports"
 msgstr "Inkludera obekräftade rapporter"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Inkorrekt värde för has_photo, \"%s\""
 
@@ -1522,7 +1656,7 @@ msgstr "Inkorrekt värde för has_photo, \"%s\""
 msgid "Inspection required"
 msgstr "Inspektion krävs"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr "Instruera entreprenörer att lösa problem"
 
@@ -1532,33 +1666,41 @@ msgstr "Interna anteckningar"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Interna refereringar"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Inkorrekt värde för agency_responsible, \"%s\""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Inkorrekt slutdatum"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Inkorrekt format %s angivet."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 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."
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Inkorrekt startdatum"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1589,6 +1731,15 @@ msgstr "Jurisdiktion okänd"
 msgid "Keep me signed in on this computer"
 msgstr "Behåll mig inloggad på den här datorn"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Senaste uppdatering:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1602,11 +1753,12 @@ msgstr "Senaste uppdatering:"
 msgid "Last&nbsp;update:"
 msgstr "Senaste&nbsp;uppdatering:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr "Tidigast uppdaterad"
 
@@ -1614,6 +1766,10 @@ msgstr "Tidigast uppdaterad"
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Lämna den här blank om samtliga rapporter till den här förvaltningen skall skickas med samma utskicksmetod (exv. \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Lista alla rapporterade problem"
@@ -1635,7 +1791,8 @@ msgstr "Lokala RSS-flöden och epostbevakningar"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Lokala RSS-flöden och epostbevakningar för '%s'"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Lokala rapporter"
 
@@ -1643,15 +1800,36 @@ msgstr "Lokala rapporter"
 msgid "Locate the problem on a map of the area"
 msgstr "Lokalisera problemet på en karta över området"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "KARTA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr "Hantera slutlista"
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1675,7 +1853,7 @@ msgstr "Markerad som löst/stängd under de senaste åtta veckorna"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "Markerad som löst/stängd för mer än åtta veckor sedan"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr "Lägg till problemdetaljer"
 
@@ -1695,7 +1873,7 @@ msgstr "Meddelande till extern förvaltning:"
 msgid "Missing bodies:"
 msgstr "Saknade förvaltningar:"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Saknat jurisdiction_id"
 
@@ -1703,7 +1881,7 @@ msgstr "Saknat jurisdiction_id"
 msgid "Moderate"
 msgstr "Moderera"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr "Moderera rapportdetaljer"
 
@@ -1711,15 +1889,32 @@ msgstr "Moderera rapportdetaljer"
 msgid "Moderate this report"
 msgstr "Moderera den här rapporten"
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Moderera den här rapporten"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Rapporterat av %s den %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Granskat av underavdelningen inom en arbetsdag"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "Moderera den här rapporten"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Månad"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr "Mest kommenterad"
 
@@ -1727,7 +1922,7 @@ msgstr "Mest kommenterad"
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1755,7 +1950,7 @@ msgstr "Namn:"
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr "Navigera till det här problemet"
 
@@ -1764,7 +1959,7 @@ msgstr "Navigera till det här problemet"
 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"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 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)"
 
@@ -1773,7 +1968,7 @@ msgstr "Närmaste postnummer till placeringen på kartan (genereras automatiskt)
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1857,7 +2052,7 @@ msgstr "Ny status"
 msgid "New template"
 msgstr "Ny mall"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr "Senaste"
 
@@ -1865,6 +2060,7 @@ msgstr "Senaste"
 msgid "Next"
 msgstr "Nästa"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1893,7 +2089,7 @@ msgstr "Ingen förvaltning"
 msgid "No council"
 msgstr "Ingen kommun"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Ingen kommun vald"
 
@@ -1911,6 +2107,8 @@ msgstr "Inga flaggade användare kunde hittas."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1921,6 +2119,14 @@ msgstr "Kunde inte åtgärda"
 msgid "No further updates"
 msgstr "Inga fler uppdateringar"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Inget resultat returnerades"
@@ -1963,6 +2169,8 @@ msgstr "Normala (publika) användare skall inte associeras med någon <strong>f
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2024,6 +2232,14 @@ msgstr "För att skicka din uppdatering&hellip;"
 msgid "OK"
 msgstr "OK"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Äldre/okända <br>problem"
@@ -2040,7 +2256,7 @@ msgstr "Äldre <br>fixat"
 msgid "Older <br>problems"
 msgstr "Äldre <br>problem"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr "Äldst"
 
@@ -2050,7 +2266,10 @@ msgstr "Äldst"
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2094,15 +2313,15 @@ msgstr "Eller problem rapporterade til:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Övrig"
 
@@ -2137,11 +2356,11 @@ msgstr "Lösenord (valfritt)"
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permanent länk"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr "Rättigheter:"
 
@@ -2208,8 +2427,8 @@ msgstr "Placera nålen på kartan"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2235,14 +2454,14 @@ msgid "Please check your email address is correct"
 msgstr "Vänligen kontrollera att din epostadress är korrekt"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Välj en kategori"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Välj en fastighetstyp"
 
@@ -2268,8 +2487,8 @@ msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla."
 msgid "Please enter a message"
 msgstr "Skriv in ett meddelande"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr "Skriv in ett namn"
 
@@ -2284,13 +2503,13 @@ msgid "Please enter a password"
 msgstr "Skriv in ett lösenord"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Skriv in ett ärende"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2303,7 +2522,7 @@ msgstr "Skriv in en giltig epostadress"
 msgid "Please enter a valid email address"
 msgstr "Skriv in en giltig epostadress"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Skriv några detaljer"
@@ -2330,14 +2549,14 @@ msgstr "Skriv in din epostadress"
 msgid "Please enter your first name"
 msgstr "Skriv in ditt förnamn"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2400,7 +2619,7 @@ msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>.
 msgid "Please note:"
 msgstr "Observera:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten."
 
@@ -2433,10 +2652,10 @@ msgstr "Välj den kategori av rapporter du vill ha"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Ange om problemet har lösts eller ej"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr "Ladda upp endast en bild"
 
@@ -2459,15 +2678,15 @@ msgstr "Skicka"
 msgid "Posted anonymously at %s"
 msgstr "Postat anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Postat av %s %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Postat av <strong>%s</strong> (%s) %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Postat av <strong>%s</strong> %s"
 
@@ -2483,12 +2702,12 @@ msgstr "Föregående"
 msgid "Priorities"
 msgstr "Prioriteringar"
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Personlig integritet"
 
@@ -2531,7 +2750,7 @@ msgstr "Rapport %s skickad till %s"
 msgid "Problem breakdown by state"
 msgstr "Rapporter per status"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problemet markerat som öppet."
 
@@ -2539,7 +2758,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Problem"
@@ -2560,13 +2779,13 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata"
 msgid "Problems within %.1fkm of this location"
 msgstr "Problem inom %.1f km från denna position"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Problem inom %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Problem inom området %s"
 
@@ -2612,7 +2831,7 @@ msgstr "Offentlig uppdatering:"
 msgid "Public response:"
 msgstr "Offentligt svar:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr "Offentlig uppdatering:"
 
@@ -2648,11 +2867,11 @@ msgstr "Frågeformulär ifyllt av rapportören"
 msgid "RSS feed"
 msgstr "RSS-flöde"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS-flöde för %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS-flöde för område %s, %s"
 
@@ -2660,11 +2879,11 @@ msgstr "RSS-flöde för område %s, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS-flöde för %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "RSS-flöde för %s, inom område %s"
 
@@ -2672,13 +2891,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "RSS-flöde för problem inom %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "RSS-flöde för problem inom område %s"
 
@@ -2697,7 +2916,7 @@ msgstr "RSS-flöde för uppdateringar till denna rapport"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr "Mottagen av %s kort därefter"
 
@@ -2715,7 +2934,7 @@ msgstr "Nyligen <br>åtgärdat"
 msgid "Recently reported problems"
 msgstr "Senaste rapporterade problemen"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr "Senast uppdaterad"
 
@@ -2754,12 +2973,12 @@ msgid "Report"
 msgstr "Rapportera"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr "Rapport-ID:"
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Rapportera ett problem"
@@ -2777,6 +2996,11 @@ msgstr "Rapportera som"
 msgid "Report on %s"
 msgstr "Rappoort på %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Rapportera som"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2788,7 +3012,7 @@ msgstr "Rapportera ditt problem"
 msgid "Report, view, or discuss local problems"
 msgstr "Rapportera, visa, eller diskutera lokala problem"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Rapporterat anonymt %s"
@@ -2798,7 +3022,7 @@ msgstr "Rapporterat anonymt %s"
 msgid "Reported before"
 msgstr "Rapporterat tidigare"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Rapporterat av %s den %s"
@@ -2812,27 +3036,27 @@ msgstr "Rapporterad av:"
 msgid "Reported in the %s category"
 msgstr "Rapporterat i kategori %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Anonym rapport i kategori %s, %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Rapporterat i kategori %s av %s den %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Rapporterat av %s anonymt %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Rapporterat av %s av %s den %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Rapporterat av %s i kategorin %s av %s den %s"
 
@@ -2856,11 +3080,12 @@ msgstr "Rapportera ett problem"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Rapporter"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Rapporter kan bara innehålla %s tecken. Var vänlig korta ned din rapport"
 
@@ -2868,10 +3093,6 @@ msgstr "Rapporter kan bara innehålla %s tecken. Var vänlig korta ned din rappo
 msgid "Reports awaiting approval"
 msgstr "Rapporter som väntar på att godkännas"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr "Rapporter från användare med högt nog anseende kommer att skickas omedelbart, utan att kräva inspektion. Kategoriers gränser kan hanteras i administratörskontrollpanelen. Användare ökar i anseende när en av deras rapporter markeras som inspekterade av inspektörer."
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr "Rapporter som skapas av anförtrodda användare kommer att skickas till kommunen utan att inspekteras först."
@@ -2880,7 +3101,12 @@ msgstr "Rapporter som skapas av anförtrodda användare kommer att skickas till
 msgid "Reports published"
 msgstr "Publicerade rapporter"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Rapportera ett problem"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr "Rapporter som väntar på att skickas"
 
@@ -2892,10 +3118,6 @@ msgstr "Rapporter kommer automatiskt att skickas utan att en inspektion krävs o
 msgid "Reputation threshold"
 msgstr "Anseendesgräns"
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr "Anseende:"
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Skicka om rapporten"
@@ -2927,6 +3149,18 @@ msgstr "Svarsmallar"
 msgid "Response Templates for %s"
 msgstr "Svarsmallar för %s"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2942,15 +3176,15 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens numm
 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"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2962,36 +3196,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "Rotation av detta foto kommer att radera osparade rapportändringar."
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Satellit"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "markerad som dubblett av rapport"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr "Spara med en offentlig uppdatering"
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Sök rapporter"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Sök användare"
 
@@ -3018,7 +3260,7 @@ msgstr "Inga användare hittades."
 msgid "See our privacy policy"
 msgstr "Se vår integritetsskyddspolicy"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 #, fuzzy
 msgid "See user detail for reports created as the council"
 msgstr "Skapa rapporter/uppdateringar som kommunen"
@@ -3053,7 +3295,7 @@ msgstr "Skicka utökade Open311-statusar med Service Request-uppdateringar"
 msgid "Sent report back"
 msgstr "Skicka tillbaka rapport"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Skickades till %s, %s senare"
 
@@ -3066,7 +3308,7 @@ msgstr "Skickades:"
 msgid "Service:"
 msgstr "Tjänst:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr "Sätt till min nuvarande position"
 
@@ -3074,6 +3316,7 @@ msgstr "Sätt till min nuvarande position"
 msgid "Share"
 msgstr "Dela"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3083,6 +3326,7 @@ msgstr "Slutlista"
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr "Satt på slutlistan"
 
@@ -3090,23 +3334,43 @@ msgstr "Satt på slutlistan"
 msgid "Shortlisted by %s"
 msgstr "Satt på slutlistan av %s"
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Visa äldre"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Visa mitt namn publikt"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Visa mitt namn publikt"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Visa äldre"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Visa äldre"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Visa kartnålar"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3148,7 +3412,7 @@ msgstr "Foton från de senaste rapporterna"
 msgid "Some text to localize"
 msgstr "Lite text att lokalisera"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3179,15 +3443,21 @@ msgstr "Inloggningen misslyckades. Fyll i formuläret nedan."
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen."
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 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."
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr "Sortera efter"
 
@@ -3205,12 +3475,12 @@ msgstr "Startdatum:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Status"
@@ -3226,7 +3496,7 @@ msgstr "Status:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3247,7 +3517,7 @@ msgstr "Fortfarande öppen, via frågeformulär, %s"
 msgid "Street View"
 msgstr "Street View"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Underkategori: %s"
 
@@ -3275,7 +3545,7 @@ msgstr "Skicka"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3332,11 +3602,11 @@ msgstr "Sammanfattning"
 msgid "Summary reports"
 msgstr "Sammanställningsrapporter"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr "Superanvändare:"
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 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."
 
@@ -3399,7 +3669,7 @@ msgstr "Tack för att du bifogade ett foto. Vi måste nu lokalisera ditt problem
 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 "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporterat ett problem till en kommun tidigare?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök igen."
 
@@ -3413,7 +3683,7 @@ msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummret finns tyvärr inte."
 
@@ -3569,7 +3839,7 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3643,18 +3913,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr "Den här förvaltningen kommer endast att skickas rapporter för problem inom dess <strong>geografiska område</strong>. En förvaltning kommer inte att få några rapporter om den inte täcker åtminstone ett område."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "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/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Den här informationen krävs"
 
@@ -3670,14 +3940,19 @@ msgstr "Det här är en sammanställning av alla rapporter."
 msgid "This pothole has been here for two months and…"
 msgstr "Detta hål i gatan har varit här i två månader och..."
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Det här problemet har lösts"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Det här problemet har inte lösts"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Det här problemet har inte lösts"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3725,7 +4000,7 @@ msgid "Tips for perfect photos"
 msgstr "Tips för perfekta foton"
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3756,8 +4031,26 @@ msgstr "För att visa en karta med den exakta positionen för problemet"
 msgid "Total"
 msgstr "Totalt"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "markerad som löst"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr "Krävs trafikövervakning?"
 
@@ -3765,7 +4058,7 @@ msgstr "Krävs trafikövervakning?"
 msgid "Trusted by bodies:"
 msgstr "Anförtrodd av kommunen:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr "Anförtrodd att skapa rapporter som inte behöver bli inspekterade"
 
@@ -3790,7 +4083,8 @@ msgstr "Prova att skicka ett e-brev till oss direkt:"
 msgid "Unconfirmed"
 msgstr "Obekräftat"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "ej lösta rapporter"
 
@@ -3814,6 +4108,11 @@ msgstr "Okänt fel"
 msgid "Unknown problem ID"
 msgstr "Okänt problemnummer"
 
+#: templates/web/base/reports/_list-filters.html:10
+#, fuzzy
+msgid "Unshortlisted"
+msgstr "Satt på slutlistan"
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3870,10 +4169,10 @@ msgstr "Uppdaterad status"
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3917,26 +4216,32 @@ msgstr "Använde kartan"
 msgid "User ID to attribute fetched comments to"
 msgstr "Användar-ID att attribuera hämtade kommentarer till"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Användarflaggan borttagen"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Användaren flaggad"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "markerad som löst"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Användarsökningen matchar mot användares namn och e-postadresser."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Användare"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-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."
 
@@ -3967,6 +4272,15 @@ msgstr "Visa en position"
 msgid "Viewing a problem"
 msgstr "Visa ett problem"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Delområden i denna kommun"
@@ -3986,7 +4300,7 @@ msgstr "Vi hittade mer än en träff för den problemreferensen:"
 msgid "We need your email address, please give it below."
 msgstr "Skriv in din e-postadress nedan."
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Det här problemet kan höra till %s. Dessvärre har vi ingen kontaktinformation till dem. Om du vet om en lämplig kontaktadress hör vi gärna från dig."
 
@@ -4003,6 +4317,10 @@ msgstr "Vi kommer endast att använda din information i enlighet med vår <a hre
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "Tråkigt att problemet inte åtgärdats. Du kan prova att skriva direkt till din kommun för att uppmana dem att åtgärda problemet."
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Vi återkommer så snart vi kan!"
@@ -4020,11 +4338,11 @@ msgstr "Vid förändringar"
 msgid "When sent"
 msgstr "Vid avsändning"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr "Du kan som mest ladda upp tre foton."
 
@@ -4059,10 +4377,16 @@ msgstr "Om du skriver ditt meddelande endast med versaler blir det svårare att
 msgid "Wrong location? Just click again on the map."
 msgstr "Fel plats? Klicka i så fall på kartan igen."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "År"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4091,6 +4415,10 @@ msgstr "Ja, jag har ett lösenord"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Du anmäler att den här problemrapporten var modererad i onödan:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande rapport:"
@@ -4134,6 +4462,10 @@ msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den ska
 msgid "You declined; please fill in the box above"
 msgstr "Du nekade; vänligan fyll i rutan ovan"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4192,7 +4524,7 @@ msgid "Your Reports"
 msgstr "Dina rapporter"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr "Ditt konto"
 
@@ -4229,6 +4561,11 @@ msgstr "Din information kommer endast att användas i enlighet med vår <a href=
 msgid "Your name"
 msgstr "Ditt namn och efternamn"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Dina rapporter"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4258,6 +4595,10 @@ msgstr "Dina rapporter"
 msgid "Your shortlist"
 msgstr "Din slutlista"
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Dina uppdateringar"
@@ -4268,7 +4609,7 @@ msgid "Yourself"
 msgstr "Dig själv"
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr "samtliga"
 
@@ -4276,7 +4617,7 @@ msgstr "samtliga"
 msgid "by %s"
 msgstr "av %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "markerad som dubblett av rapport"
 
@@ -4304,49 +4645,49 @@ msgstr "ändra användare"
 msgid "from %s different users"
 msgstr "från %s olika användare"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "senast uppdaterad %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "mindre än en minut"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "markerad som åtgärd schemalagd"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "markerad som intern referering"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "markerad som stängd"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "markerad som löst"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "markerad som pågående"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "markerad som under utredning"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "markerad som kunde inte åtgärda"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "markerad som ej kommunens ansvar"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "markerad som planerad"
 
@@ -4357,7 +4698,7 @@ msgid "n/a"
 msgstr "Ej tillgängligt"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr "inga"
 
@@ -4392,8 +4733,8 @@ msgstr "ursprungligen inmatat: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "andra områden:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "öppnat på nytt"
 
@@ -4414,7 +4755,7 @@ msgstr "kommunen"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "den här typen av problem"
 
@@ -4422,6 +4763,16 @@ msgstr "den här typen av problem"
 msgid "today"
 msgstr "idag"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Uppdatering"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Uppdateringar"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "använde kartan"
@@ -4439,27 +4790,41 @@ msgstr "användaren är inte problemägare"
 msgid "ward"
 msgstr "område"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, fuzzy, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] "E-postadress"
+msgstr[1] "E-postadress"
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuter"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4467,13 +4832,20 @@ msgid_plural "%d supporters"
 msgstr[0] "%d supporter"
 msgstr[1] "%d supportrar"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d vecka"
 msgstr[1] "%d veckor"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4502,6 +4874,13 @@ msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> uppdatering av rapporter"
 msgstr[1] "<big>%s</big> uppdateringar av rapporter"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Rapporterat av %s den %s"
+msgstr[1] "Rapporterat av %s den %s"
+
 #: 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."
@@ -4516,5 +4895,49 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] "Vi har ännu ingen information om kommunen på den platsen"
 msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
 
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "senast uppdaterad %s"
+msgstr[1] "senast uppdaterad %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Rapportera"
+msgstr[1] "Rapportera"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Samtliga kategorier"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Externt ID"
+
+#, fuzzy
+#~ msgid "Inspector:"
+#~ msgstr "Inspektion krävs"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Redigera rapportkategori"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Rapporterat av %s den %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "senast uppdaterad %s"
+
+#~ msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
+#~ msgstr "Rapporter från användare med högt nog anseende kommer att skickas omedelbart, utan att kräva inspektion. Kategoriers gränser kan hanteras i administratörskontrollpanelen. Användare ökar i anseende när en av deras rapporter markeras som inspekterade av inspektörer."
+
+#~ msgid "Reputation:"
+#~ msgstr "Anseende:"
+
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
index 4c2db53c8..4897c9b81 100644
--- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/tr_TR.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "ve"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s bölüm, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, içinde %s bölüm"
 
@@ -154,7 +154,7 @@ msgstr "(onarıldı)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya da sokak aydınlatma gibi)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(kurula gönderilmemiş)"
 
@@ -162,17 +162,17 @@ msgstr "(kurula gönderilmemiş)"
 msgid "(optional)"
 msgstr "(isteğe bağlı)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(her ikisine de gönderildi)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Kategori seçiniz--"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Bir özellik seçiniz --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "Bu muhtemelen \"kapalı alanın\" neden boş olduğunu(aşağıda)<br>\n"
 "Belkide yapılandırma dosyanıza bazı <code>MAPIT_TYPES</code> eklemelisiniz?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izi
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Hayır</strong> e-posta yoluyla giriş yapmama izin ver"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -235,6 +251,8 @@ msgstr "<strong>Evet</strong> şifrem var"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -281,15 +299,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Kullanıcı ekle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -301,6 +319,10 @@ msgstr "Eklenmiş %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Tekrar:"
@@ -317,6 +339,12 @@ msgstr "Uyarı %d engellendi (oluşturuldu %s)"
 msgid "Alert me to future updates"
 msgstr "Güncellemeleri bildir"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -326,12 +354,14 @@ msgstr "Tüm Bildirimler"
 msgid "All Reports as CSV"
 msgstr "Tüm raporlar CSV olarak"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -366,11 +396,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Geliştirici misiniz?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -407,7 +438,7 @@ msgstr "Dışarıdan bir organ atamak:"
 msgid "Assign to subdivision:"
 msgstr "Alt bölüm atamak:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -433,15 +464,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Denetleme bekliyor"
@@ -459,7 +498,7 @@ msgid "Ban email address"
 msgstr "Email adresini engelle"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -468,7 +507,7 @@ msgid "Bodies"
 msgstr "Bölümler"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -496,14 +535,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -514,7 +554,7 @@ msgstr ""
 msgid "Category"
 msgstr "Kategori"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -524,6 +564,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -531,7 +572,7 @@ msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta"
 msgid "Category:"
 msgstr "Kategori:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Kategori: %s"
 
@@ -598,10 +639,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -632,10 +677,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -643,11 +690,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Kapalı"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Kurul tarafından kapatıldı"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -673,6 +720,11 @@ msgstr "Cobrand data:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "kullanılan harita"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -736,8 +788,8 @@ msgstr "Grupla bağlantı kur"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Kullanıcı bulunamadı"
 
@@ -755,6 +807,36 @@ msgstr "Kurul"
 msgid "Council contacts for %s"
 msgstr "Kurula ulaşmak için %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "kapandı olarak işaretle"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "Onarıldı olarak işaretle"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "Devam etmekte olarak işaretle"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "araştırılıyor olarak işaretle"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "Planlandı olarak işaretle"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "Kurul ref:&nbsp;%s"
@@ -779,15 +861,15 @@ msgstr "Bildiri oluştur"
 msgid "Create category"
 msgstr "Kategori oluştur"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -831,7 +913,11 @@ msgstr "Kontrol Paneli "
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Alt komisyon tarafından 5 iş günü içinde üstesinden gelinilecek"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -845,6 +931,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Silindi"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -881,6 +972,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Özenle hazırlanmış işbirliği tablosu"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Değişiklikleri kaydet"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -906,23 +1003,25 @@ msgstr "Şekilleri beğenmediniz mi?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Çoğaltmak"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Çoğaltmak"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Çoğaltmak"
@@ -935,8 +1034,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -950,28 +1049,28 @@ msgid "Edit"
 msgstr "Ekle"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Bölümün detaylarını düzenle"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1010,7 +1109,7 @@ msgstr "Editör"
 msgid "Email"
 msgstr "E-posta"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "E-posta kara listeye eklendi"
 
@@ -1028,7 +1127,7 @@ msgstr "E-posta uyarısı oluşturuldu"
 msgid "Email alert deleted"
 msgstr "E-posta uyarısı silindi"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "E-posta kara listede"
 
@@ -1077,7 +1176,7 @@ msgstr "Varılan nokta"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "Bir Z&uuml;rich sokak ismi giriniz"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz"
 
@@ -1111,8 +1210,8 @@ msgstr "Problem hakkında detaylı bilgi giriniz"
 msgid "Error"
 msgstr "Hata"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1126,14 +1225,23 @@ msgid "Examples:"
 msgstr "Örnekler:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "Tüm raporlar CSV olarak"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1142,6 +1250,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1162,8 +1271,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "İlave veriler:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1188,10 +1297,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1199,6 +1310,8 @@ msgstr "Sorun çözüldü"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Sorun çözüldü- Kurul"
 
@@ -1207,7 +1320,7 @@ msgstr "Sorun çözüldü- Kurul"
 msgid "Fixed - User"
 msgstr "Sorun çözüldü- Kullanıcı"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1216,7 +1329,7 @@ msgid "Fixed:"
 msgstr "Sorun çözüldü:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Silindi olarak seçildi"
@@ -1302,11 +1415,13 @@ msgstr "Bana RSS hakkında geri dönüş yapın"
 msgid "Glad to hear it’s been fixed!"
 msgstr "Problemin çözüldüğünü duymak güzel"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Git"
@@ -1315,11 +1430,11 @@ msgstr "Git"
 msgid "Going to send questionnaire?"
 msgstr "Anket gönderecek misiniz?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Zamanla oluşan problemlerin duruma göre grafikleri"
 
@@ -1335,7 +1450,7 @@ msgstr "Bu sorun giderildi mi? "
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Daha önce bir problemi bir kurula bildirdiniz mi, yoksa bu ilk defa mı?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1360,6 +1475,9 @@ msgstr "Merhaba %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1367,6 +1485,11 @@ msgstr "Merhaba %s"
 msgid "Hidden"
 msgstr "Gizli"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Bildiriyi tekrar gönder"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Eskileri gizle"
@@ -1375,6 +1498,10 @@ msgstr "Eskileri gizle"
 msgid "Hide pins"
 msgstr "İğneler gizle"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Tarihçe"
@@ -1406,7 +1533,7 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n"
 
 #: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1424,6 +1551,10 @@ msgid ""
 "          For basic installations, you don't need to join bodies in this way."
 msgstr ""
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1434,7 +1565,7 @@ msgstr ""
 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
 msgstr "Sorununuzun durumu ile ilgili daha fazla bilgi almak istiyorsanız, lütfen ana sayfaya geri dönün ve bir güncelleme bırakın."
 
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1492,8 +1623,8 @@ msgstr "Kanunsuz kimlik "
 msgid "Illegal feed selection"
 msgstr "Yasadışı bildirim seçimi"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1511,7 +1642,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1529,7 +1662,7 @@ msgstr "Bildiren kişinin kişisel bilgilerini dahil et"
 msgid "Include unconfirmed reports"
 msgstr "Onaylanmamış bildirimleri dahil et"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Hatalı sahip_fotoğraf değer \"%s\""
 
@@ -1537,7 +1670,7 @@ msgstr "Hatalı sahip_fotoğraf değer \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1547,33 +1680,41 @@ msgstr "İç notlar"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "İç yönlendirme"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Geçersiz ajans_sorumlu değer %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Geçersiz bitiş tarihi"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Geçersiz format %s belirlenmiş."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Geçersiz başlangıç tarihi"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1604,6 +1745,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Bu bilgisayarda oturumu açık tut"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Son güncelleme:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1617,11 +1767,12 @@ msgstr "Son güncelleme:"
 msgid "Last&nbsp;update:"
 msgstr "Son&nbsp;güncelleme:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1629,6 +1780,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Eğerbu birime  bürün bildirimler aynı gönderme yöntemi ile yapılacak ise burayı boş bırakın (ör., \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Bildirilmiş problemleri güncelle"
@@ -1650,7 +1805,8 @@ msgstr "Yerel RSS bildirimi ve e-posta uyarısı"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Yerel RSS bildirimi ve‘%s’ için e-posta uyarısı"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Yerel uyarılar"
 
@@ -1658,15 +1814,36 @@ msgstr "Yerel uyarılar"
 msgid "Locate the problem on a map of the area"
 msgstr "Problemin bulunduğu alandaki haritayı bul ve işaretle"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "HARİTA"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1690,7 +1867,7 @@ msgstr "8 hafta önce halledilmiş/kapatılmış olarak işaretlendi"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "8 haftadan daha uzun bir süre önce halledilmiş/kapatılmış olarak işaretlendi"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1710,7 +1887,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Eksik yetki_id"
 
@@ -1718,7 +1895,7 @@ msgstr "Eksik yetki_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1726,15 +1903,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "%s tarafından %s de bildirilmiştir"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "%s tarafından %s de bildirilmiştir"
+
 #: templates/web/zurich/admin/stats.html:34
 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/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "diğer bölgeler:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Ay"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1742,7 +1936,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1770,7 +1964,7 @@ msgstr "İsim:"
 msgid "Name: %s"
 msgstr "İsim: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1779,7 +1973,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr ""
 
@@ -1788,7 +1982,7 @@ msgstr ""
 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Alerts.pm:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1870,7 +2064,7 @@ msgstr "Yeni durum"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1878,6 +2072,7 @@ msgstr ""
 msgid "Next"
 msgstr "Sonraki"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1906,7 +2101,7 @@ msgstr "Birim yok"
 msgid "No council"
 msgstr "Kurul yok"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Seçilmiş kurul yok"
 
@@ -1924,6 +2119,8 @@ msgstr "İşaretlenen kullanıcılar bulunamadı."
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1934,6 +2131,14 @@ msgstr "Onarımı mümkün değil"
 msgid "No further updates"
 msgstr "Güncelleme yok"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Herhangi bir geri dönüş olmamıştır"
@@ -1974,6 +2179,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2035,6 +2242,14 @@ msgstr ""
 msgid "OK"
 msgstr "Tamam"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Eski/ bilinmeyen <br>problemler"
@@ -2051,7 +2266,7 @@ msgstr "Geçmişte <br>onarılmış"
 msgid "Older <br>problems"
 msgstr "Eski <br>sorunlar"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2061,7 +2276,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2105,15 +2323,15 @@ msgstr "Veya 'e bildirilen sorunlar:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Diğer"
 
@@ -2148,11 +2366,11 @@ msgstr "Şifre (isteğe bağlı)"
 msgid "Password:"
 msgstr "Şifre:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Permalink"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2219,8 +2437,8 @@ msgstr "Harita üzerine işaretleyin"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2246,14 +2464,14 @@ msgid "Please check your email address is correct"
 msgstr "E-posta adresinizin doğruluğunu kontrol ediniz"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Kategori seçiniz"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Bir özellik seçin"
 
@@ -2279,8 +2497,8 @@ msgstr ""
 msgid "Please enter a message"
 msgstr "Mesaj giriniz"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2295,13 +2513,13 @@ msgid "Please enter a password"
 msgstr "Şifre giriniz"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Konu giriniz"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2314,7 +2532,7 @@ msgstr "Geçerli e-posta giriniz"
 msgid "Please enter a valid email address"
 msgstr "Geçerli e-posta adresi giriniz"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Lütfen bir kaç ayrıntı giriniz"
@@ -2341,14 +2559,14 @@ msgstr "Lütfen mail adresinizi giriniz"
 msgid "Please enter your first name"
 msgstr "Ad giriniz"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2411,7 +2629,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Lütfen dikkat:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2444,10 +2662,10 @@ msgstr "İstediğiniz bir bildiri şekli secin"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lütfen"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2470,15 +2688,15 @@ msgstr "Paylaş"
 msgid "Posted anonymously at %s"
 msgstr "%s Anonim olarak gönderildi"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Tarafından paylaşıldı %s saat %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 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:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "<strong>%s</strong> tarafından %s 'te paylaşılmıştır"
 
@@ -2494,12 +2712,12 @@ msgstr "Önceki"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "Gizlilik"
 
@@ -2542,7 +2760,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:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Problem çözülmemiş olarak işaretlenmiştir."
 
@@ -2550,7 +2768,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:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Sorunlar"
@@ -2571,13 +2789,13 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble
 msgid "Problems within %.1fkm of this location"
 msgstr "Konumun %.1fkm içerisinde yer alan sorunlar"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "%s deki problemler"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "%s semtindeki sorunlar"
 
@@ -2623,7 +2841,7 @@ msgstr "Toplumsal geri bildirim:"
 msgid "Public response:"
 msgstr "Toplumsal geri bildirim:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2659,11 +2877,11 @@ msgstr "Anket sorun bildirici tarafından dolduruldu"
 msgid "RSS feed"
 msgstr "RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "%s için RSS Besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "%s için %s gözetiminde RSS besleme"
 
@@ -2671,11 +2889,11 @@ msgstr "%s için %s gözetiminde RSS besleme"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "%s için RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s içinde %s gözetimiyle RSS besleme"
 
@@ -2683,13 +2901,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:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "%s içerisindeki problemlerle alakalı RSS besleme"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme"
 
@@ -2708,7 +2926,7 @@ msgstr "Bu problemin güncellemelerini RSS olarak besle"
 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:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2726,7 +2944,7 @@ msgstr "Yakın zamanda <br>onarılmış"
 msgid "Recently reported problems"
 msgstr "Yakın zamanda bildirilen problemler"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2765,12 +2983,12 @@ msgid "Report"
 msgstr "Bildirim"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Bir problem bildir"
@@ -2788,6 +3006,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "%s 'e bildir"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Kötüye kullanım bildir"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2799,7 +3022,7 @@ msgstr "Probleminizi bildirin"
 msgid "Report, view, or discuss local problems"
 msgstr "Yerel problemleri bildir, göster ve tartış"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "%s 'e ananim olarak bildirilmiş"
@@ -2809,7 +3032,7 @@ msgstr "%s 'e ananim olarak bildirilmiş"
 msgid "Reported before"
 msgstr "Önceden bildirilmiş"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "%s tarafından %s de bildirilmiştir"
@@ -2823,27 +3046,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "%s kategorisine bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s kategorisine anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 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:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "%s yoluyla %s tarafından %s da bildirilmiştir"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 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:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 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"
 
@@ -2867,11 +3090,12 @@ msgstr "Bir problemin bildirilmesi"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Bildirimler"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltınız lütfen"
 
@@ -2879,10 +3103,6 @@ msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltın
 msgid "Reports awaiting approval"
 msgstr "Onay bekleyen bildirimler"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2891,7 +3111,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Yayınlanmış bildirimler"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Bir problem bildir"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2903,10 +3128,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Bildiriyi tekrar gönder"
@@ -2938,6 +3159,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2953,15 +3186,15 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Sola Yerleştir"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2973,36 +3206,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "Uydu"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "tekrarlanmış bildirim olarak işaretle"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Bildirimleri ara"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Kullanıcı Ara"
 
@@ -3029,7 +3270,7 @@ msgstr "Arama sonucu kullanıcı bulunamadı"
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3063,7 +3304,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "%s %s sonra gönder"
 
@@ -3076,7 +3317,7 @@ msgstr "gönderildi:"
 msgid "Service:"
 msgstr "Hizmet:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3084,6 +3325,7 @@ msgstr ""
 msgid "Share"
 msgstr "Paylaş"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3093,6 +3335,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3100,23 +3343,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Eskileri göster"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "İsmimi açıkça göster "
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "İsmimi açıkça göster "
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Eskileri göster"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Eskileri göster"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "İşaretlemeleri göster"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3156,7 +3419,7 @@ msgstr "Son bildirimlerden bazı fotograflar"
 msgid "Some text to localize"
 msgstr "Konumun belirlenebilmesi için tarif"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 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."
 
@@ -3187,15 +3450,21 @@ msgstr ""
 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/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3213,12 +3482,12 @@ msgstr "Başlangıç Tarihi:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Devlet"
@@ -3234,7 +3503,7 @@ msgstr "Devlet:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3255,7 +3524,7 @@ msgstr "Henüz çözülmemiş, anket aracılığıyla, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Alt kategori: %s"
 
@@ -3283,7 +3552,7 @@ msgstr "Kaydet"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3340,11 +3609,11 @@ msgstr "Özet"
 msgid "Summary reports"
 msgstr "Özet bildirimler"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3407,7 +3676,7 @@ msgstr "Resim yüklediğiniz için teşekkür ederiz. Şİmsi sorunu konumlandı
 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 "Teşekkürler, sorunun hallolduğuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiş miydiniz?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Bu şekilde resim doğru yüklemiş gibi görünmüyor (%s), lütfen tekrar deneyin."
 
@@ -3421,7 +3690,7 @@ msgstr "Konum İngiltere'de görünmüyor; lütfen tekrar deneyin."
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Üzgünüz, bu posta kodu bulunamadı."
 
@@ -3577,7 +3846,7 @@ msgstr "Tüm Bildirimlerin görüntülendiği sayfada bir sorun var. Lütfen dah
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3651,18 +3920,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr "Bu birime sadece <strong>alanda yer alan ve</strong> konuyu kapsayan bildirimler gönderilebilecektir. Bu birime bu iki maddeden herhangi birini kapsamayan bildirimler ulaşmayacaktır."
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 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 "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta problemin konumunu kapsayacak iki kurula da gönderilir. Eğer problemle ilgilenecek olan doğru kurul değil iseniz, bu bildirimi dikkate almayınız veya problemin hangi kategoriyle olduğunu bize bildirin ki biz de sistemimizde doğru kurula yönlendirelim."
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Bu bilgi gereklidir"
 
@@ -3678,14 +3947,19 @@ msgstr "Bu, bu sitedeki bütün raporların özetidir."
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Bu problem çözüldü"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Bu problem giderilemedi"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Bu problem giderilemedi"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3733,7 +4007,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3764,8 +4038,26 @@ msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için"
 msgid "Total"
 msgstr "Toplam"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "Onarıldı olarak işaretle"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3773,7 +4065,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3798,7 +4090,8 @@ msgstr "Direkt olarak e-posta gönderin:"
 msgid "Unconfirmed"
 msgstr "Onaylanmamış"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3822,6 +4115,10 @@ msgstr "Bilinmeyen hata"
 msgid "Unknown problem ID"
 msgstr "Bilinmeyen ID problemi"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3878,10 +4175,10 @@ msgstr "Güncelleme durumu"
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3925,26 +4222,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Kullanıcı etiketi kaldırıldı"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Kullanıcı etiketlendi"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "Onarıldı olarak işaretle"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur."
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3975,6 +4278,15 @@ msgstr "Bir konum görüntülemek"
 msgid "Viewing a problem"
 msgstr "Bir problemi görüntülemek"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Bu kurulun ilgilendiği bölge"
@@ -3994,7 +4306,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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 "Bu problemin %s sorumluluğunda olduğunun farkındayız; ancak, şu anda irtibat bilgilerine sahip değiliz. Eğer uygun irtibat adresini biliyorsanız, bizimle iletişime geçin."
 
@@ -4011,6 +4323,10 @@ msgstr "Kişisel bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politik
 msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
 msgstr "We&rsquo;re problemin çözülemediği için üzgünüz. Yerel temsilcilere başvurmaya ne dersiniz?"
 
+#: templates/web/base/dashboard/index.html:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "Mümkün olan en kısa sürede size dönüş yapacağız."
@@ -4028,11 +4344,11 @@ msgstr "Yayınlandığında"
 msgid "When sent"
 msgstr "Gönderildiğinde"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4067,10 +4383,16 @@ msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri
 msgid "Wrong location? Just click again on the map."
 msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın."
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Yıl"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4099,6 +4421,10 @@ msgstr "Evet şifrem var"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "Bu problem bildirimini gereksiz bir şekilde yönetildiği için şikayet ediyorsun:"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: "
@@ -4144,6 +4470,10 @@ msgstr "Eğer bir bölümü sitede aktif olarak bulunsun istemiyorsanız, silind
 msgid "You declined; please fill in the box above"
 msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4202,7 +4532,7 @@ msgid "Your Reports"
 msgstr "Bildirimlerin"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4239,6 +4569,11 @@ msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a>
 msgid "Your name"
 msgstr "Adınız"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Bildirimlerin"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4268,6 +4603,10 @@ msgstr "Bildirimlerin"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Güncellemelerin"
@@ -4278,7 +4617,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4286,7 +4625,7 @@ msgstr ""
 msgid "by %s"
 msgstr "%s tarafından"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "tekrarlanmış bildirim olarak işaretle"
 
@@ -4314,49 +4653,49 @@ msgstr "kullanıcı düzenle"
 msgid "from %s different users"
 msgstr " %s farklı kullanıcılardan"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "son güncelleme %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "bir dakikadan az"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "planlanan eylem olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "bir iç yönlendirme olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "kapandı olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "Onarıldı olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "Devam etmekte olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "araştırılıyor olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "onarılamaz olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "Kurulun sorumluluğu dışında olarak işaretle"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "Planlandı olarak işaretle"
 
@@ -4367,7 +4706,7 @@ msgid "n/a"
 msgstr "n/a"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4402,8 +4741,8 @@ msgstr "özgün giriş: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "diğer bölgeler:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "yeniden açıldı"
 
@@ -4424,7 +4763,7 @@ msgstr "ilgili yerel kurul "
 msgid "there is no pin shown as the user did not use the map"
 msgstr "Kullanıcı haritayı kullanmadığından herhangi bir işaret görünmüyor"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "bu tip lokal problem"
 
@@ -4432,6 +4771,16 @@ msgstr "bu tip lokal problem"
 msgid "today"
 msgstr "bugün"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Güncelleme"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Güncellemeler"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "kullanılan harita"
@@ -4449,36 +4798,54 @@ msgstr "kullanıcı problemin sahibi"
 msgid "ward"
 msgstr "bölge"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d gün"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d saat"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d dakika"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d dakika"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
 msgid_plural "%d supporters"
 msgstr[0] "%d destekçiler"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d hafta"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4503,6 +4870,12 @@ msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "%s tarafından %s de bildirilmiştir"
+
 #: 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."
@@ -4514,3 +4887,35 @@ msgstr[0] "Bahsettiğiniz alanı kapsayan ilgili diğer kurullar hakkında henü
 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] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok."
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "son güncelleme %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Bildirim"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Tüm Bildirimler"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "Harici URL "
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Kategori oluştur"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "%s tarafından %s de bildirilmiştir"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "son güncelleme %s"
diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
index ce9dfee93..13c101a97 100644
--- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/uk_UA.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n"
@@ -18,8 +18,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:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "і"
 
@@ -102,11 +102,11 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s район, %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, в межах %s району"
 
@@ -154,7 +154,7 @@ msgstr "(полагоджено)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(графіті, сміття, крива бруківка, проблеми з вуличним освітленням тощо)"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "(не відправлено муніципалітету)"
 
@@ -162,17 +162,17 @@ msgstr "(не відправлено муніципалітету)"
 msgid "(optional)"
 msgstr "(вибірково)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "(відправлено обидвом)"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "-- Оберіть категорію --"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "-- Оберіть тип майна --"
 
@@ -184,6 +184,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -195,12 +203,20 @@ msgstr ""
 "              This is probably why \"area covered\" is empty (below).<br>\n"
 "              Maybe add some <code>MAPIT_TYPES</code> to your config file?"
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -219,11 +235,11 @@ msgstr "<strong>Ні</strong> Я підтверджу поновлення е-п
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>Ні</strong> я залогінюсь через е-пошту"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -235,6 +251,8 @@ msgstr "<strong>Так</strong> В мене є пароль"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -277,15 +295,15 @@ msgstr ""
 msgid "Add user"
 msgstr "Додати користувача"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -297,6 +315,10 @@ msgstr "Додано %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "Ще раз:"
@@ -313,6 +335,12 @@ msgstr "Сповіщення %d відключено (створено %s)"
 msgid "Alert me to future updates"
 msgstr "Повідомляти мене про оновлення"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -322,12 +350,14 @@ msgstr "Всі звіти"
 msgid "All Reports as CSV"
 msgstr ""
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -362,11 +392,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "Ви розробник?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -403,7 +434,7 @@ msgstr "Назначити зовнішньому відділу:"
 msgid "Assign to subdivision:"
 msgstr "Назначити підрозділу:"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -429,15 +460,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "Очікує перевірки модератором"
@@ -455,7 +494,7 @@ msgid "Ban email address"
 msgstr "Забанити адресу"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -464,7 +503,7 @@ msgid "Bodies"
 msgstr "Органи"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -492,14 +531,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -510,7 +550,7 @@ msgstr ""
 msgid "Category"
 msgstr "Категорія"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -520,6 +560,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "В цій категорії проблеми не вирішуються > 4 тижнів"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -527,7 +568,7 @@ msgstr "В цій категорії проблеми не вирішуютьс
 msgid "Category:"
 msgstr "Категорія:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "Категорія: %s"
 
@@ -584,10 +625,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -618,10 +663,12 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -629,11 +676,11 @@ msgstr ""
 msgid "Closed"
 msgstr "Закрито"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "Закрито муніципалітетом"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr ""
 
@@ -659,6 +706,11 @@ msgstr "Cobrand data:"
 msgid "Cobrand:"
 msgstr "Cobrand:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "викроистана мапа"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -722,8 +774,8 @@ msgstr "Звернутись до команди"
 msgid "Coordinates:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "Не вдалось знайти користувача"
 
@@ -741,6 +793,36 @@ msgstr "Рада"
 msgid "Council contacts for %s"
 msgstr "Контакти ради для %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "позначено закритим"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "позначено полагодженим"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "позначено в процесі"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "позначено у вивченні"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "позначено запланованим"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "рада ref:&nbsp;%s"
@@ -765,15 +847,15 @@ msgstr "Створити сповіщення"
 msgid "Create category"
 msgstr "Створити категорію"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -817,7 +899,11 @@ msgstr "Дашборд"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "Dealt with by subdivision within 5 working days"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -831,6 +917,11 @@ msgstr ""
 msgid "Deleted"
 msgstr "Видалено"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -867,6 +958,12 @@ msgstr ""
 msgid "Diligency prize league table"
 msgstr "Таблиця найстаранніших призерів"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "Зберети зміни"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -892,23 +989,25 @@ msgstr "Не любите форми?"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "Дубль"
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "Дубль"
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "Дубль"
@@ -921,8 +1020,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -936,28 +1035,28 @@ msgid "Edit"
 msgstr "Редагувати"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "Редагувати дані про орган"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -996,7 +1095,7 @@ msgstr "Редактор"
 msgid "Email"
 msgstr "Е-пошта"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "Пошта занесена в чорний список"
 
@@ -1014,7 +1113,7 @@ msgstr ""
 msgid "Email alert deleted"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "Адреса вже в чорному списку"
 
@@ -1059,7 +1158,7 @@ msgstr "Кінцева точка"
 msgid "Enter a Z&uuml;rich street name"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "Вкажіть поштовий код UK або назву вулиці та місця"
 
@@ -1093,8 +1192,8 @@ msgstr "Введіть подробиці проблеми"
 msgid "Error"
 msgstr "Помилка"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr ""
 
@@ -1108,14 +1207,22 @@ msgid "Examples:"
 msgstr "Приклади:"
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+msgid "Export as CSV"
+msgstr ""
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1124,6 +1231,7 @@ msgid "Extern"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1144,8 +1252,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "Додаткові дані:"
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1170,10 +1278,12 @@ msgstr "Полагодіть це вибравши <strong>зону покрит
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1181,6 +1291,8 @@ msgstr "Вирішено"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "Вирішено - Рада"
 
@@ -1189,7 +1301,7 @@ msgstr "Вирішено - Рада"
 msgid "Fixed - User"
 msgstr "Вирішено - Користувач"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr ""
 
@@ -1198,7 +1310,7 @@ msgid "Fixed:"
 msgstr "Вирішено:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "Відмітьте як видалене"
@@ -1284,11 +1396,13 @@ msgstr "Дайте RSS фід"
 msgid "Glad to hear it’s been fixed!"
 msgstr ""
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "Вперед"
@@ -1297,11 +1411,11 @@ msgstr "Вперед"
 msgid "Going to send questionnaire?"
 msgstr "Збираєтесь відправити опитувальник?"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "Графік створення проблем з часом"
 
@@ -1317,7 +1431,7 @@ msgstr "Проблему було вирішено?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "Ви вже сповіщали про проблеми раніше, чи це вперше?"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1342,6 +1456,9 @@ msgstr "Вітаємо, %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1349,6 +1466,11 @@ msgstr "Вітаємо, %s"
 msgid "Hidden"
 msgstr "Прихований"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "Перевідіслати сповіщення"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "Приховати застарілі"
@@ -1357,6 +1479,10 @@ msgstr "Приховати застарілі"
 msgid "Hide pins"
 msgstr "Приховати привязки"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "Історія"
@@ -1388,7 +1514,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1408,6 +1534,10 @@ msgstr ""
 "Визначіть <strong>предка</strong> якщо цей орган є частиною іншого органу.\n"
 "          Для базових налаштувань вам не потрібно поєднувати органи таким чином."
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1420,7 +1550,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1478,8 +1608,8 @@ msgstr "Невірний ідентифікатор"
 msgid "Illegal feed selection"
 msgstr "Невірний вибір завантаження"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1497,7 +1627,9 @@ msgstr ""
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1515,7 +1647,7 @@ msgstr "Додати особисті дані автора сповіщення
 msgid "Include unconfirmed reports"
 msgstr "Включити непідтверджені сповіщення"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Невірне значення has_photo \"%s\""
 
@@ -1523,7 +1655,7 @@ msgstr "Невірне значення has_photo \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1533,33 +1665,41 @@ msgstr "Внутрішні нотатки"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "Внутрішнє посилання"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "Невірне значення agency_responsible %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "Невірна кінцева дата"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "Невірний формат %s ."
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "Невірна початкова дата"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1590,6 +1730,15 @@ msgstr ""
 msgid "Keep me signed in on this computer"
 msgstr "Запам'ятати мене на цьому комп'ютері"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "Останнє поновлення:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1603,11 +1752,12 @@ msgstr "Останнє поновлення:"
 msgid "Last&nbsp;update:"
 msgstr "Останнє&nbsp;поновлення:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1615,6 +1765,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "Залишіть це поле порожнім якщо всі сповіщення цьому органу будуть відсилатись одним і тим самим чином (наприклад, \"%s\")."
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "Показати всі прозвітовані проблеми"
@@ -1636,7 +1790,8 @@ msgstr "Локальний RSS потік та поштові сповіщенн
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "Локальний RSS потік та поштові сповіщення для ‘%s’"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "Локальні сповіщення"
 
@@ -1644,15 +1799,36 @@ msgstr "Локальні сповіщення"
 msgid "Locate the problem on a map of the area"
 msgstr "Позначте проблему на карті району"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "Мапа"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1676,7 +1852,7 @@ msgstr ""
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1696,7 +1872,7 @@ msgstr ""
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "Бракує jurisdiction_id"
 
@@ -1704,7 +1880,7 @@ msgstr "Бракує jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1712,15 +1888,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "Перевідкрито %s о %s"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "Перевідкрито %s о %s"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "Модерується підрозділом на протязі робочого дня"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "інші зони:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "Місяць"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1728,7 +1921,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1756,7 +1949,7 @@ msgstr "Ім'я:"
 msgid "Name: %s"
 msgstr "Ім'я: %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1765,7 +1958,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через OpenStreetMap): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "Найближчий поштовий індекс до шпильки на карті (автоматично згенеровано): %s (відстань: %sм)"
 
@@ -1774,7 +1967,7 @@ msgstr "Найближчий поштовий індекс до шпильки 
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1858,7 +2051,7 @@ msgstr "Новий стан"
 msgid "New template"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1866,6 +2059,7 @@ msgstr ""
 msgid "Next"
 msgstr "Далі"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1894,7 +2088,7 @@ msgstr "Без органу"
 msgid "No council"
 msgstr "Без департаменту"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "Не вибраний департамент"
 
@@ -1912,6 +2106,8 @@ msgstr "Не знайдено маркованих користувачів"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1922,6 +2118,14 @@ msgstr "Неможливо виправити"
 msgid "No further updates"
 msgstr "Подальші оновлення відсутні"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "Ніякого результату не повернено"
@@ -1962,6 +2166,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2023,6 +2229,14 @@ msgstr "Тепер щоб відправити ваше поновлення&hel
 msgid "OK"
 msgstr "Гаразд"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "Застарілі / невизначені <br>проблеми"
@@ -2039,7 +2253,7 @@ msgstr "Раніше <br>виправлено"
 msgid "Older <br>problems"
 msgstr "Старіші <br>проблеми"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2049,7 +2263,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2093,15 +2310,15 @@ msgstr "Або проблеми прозвітовані до:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "Або ви можете підписатись на алярми відносно вашого району чи департаменту:"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "Інше"
 
@@ -2136,11 +2353,11 @@ msgstr "Пароль (опціонально)"
 msgid "Password:"
 msgstr "Пароль:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "Постійне посилання"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2207,8 +2424,8 @@ msgstr "Розмістіть шпильку на карті"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2234,14 +2451,14 @@ msgid "Please check your email address is correct"
 msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "Будь ласка оберіть категорію"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "Будь ласка оберіть тип майна"
 
@@ -2267,8 +2484,8 @@ msgstr "Будь ласка не використовуйте образи&nbsp;
 msgid "Please enter a message"
 msgstr "Будь ласка введіть повідомлення"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2283,13 +2500,13 @@ msgid "Please enter a password"
 msgstr "Будь ласка введіть пароль"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "Будь ласка вкажіть тему"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2302,7 +2519,7 @@ msgstr "Будь ласка введіть правильну адресу е-п
 msgid "Please enter a valid email address"
 msgstr "Будь ласка введіть правильну адресу е-пошти"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "Будь ласка додайте трохи подробиць"
@@ -2329,14 +2546,14 @@ msgstr "Будь ласка вкажіть адресу е-пошти"
 msgid "Please enter your first name"
 msgstr "Будь ласка введіть ім'я"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2399,7 +2616,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "Будь ласка зауважте:"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2432,10 +2649,10 @@ msgstr "Будь ласка оберіть тип бажаних алярмів"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "Будь ласка вкажіть чи була вирішена проблема"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2458,15 +2675,15 @@ msgstr "Допис"
 msgid "Posted anonymously at %s"
 msgstr "Опубліковано анонімно в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "Опубліковано %s в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "Опубліковано <strong>%s</strong> (%s) в %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "Опубліковано <strong>%s</strong> в %s"
 
@@ -2482,12 +2699,12 @@ msgstr "Попередній"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr ""
 
@@ -2530,7 +2747,7 @@ msgstr "Проблему %s надіслано департаменту %s"
 msgid "Problem breakdown by state"
 msgstr "Розбивка проблем по стану"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "Проблема маркована відкритою."
 
@@ -2538,7 +2755,7 @@ msgstr "Проблема маркована відкритою."
 msgid "Problem state change based on survey results"
 msgstr "Стан проблеми змінено базуючись на результатах опитувань"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "Проблеми"
@@ -2559,13 +2776,13 @@ msgstr "Нещодавно вирішені проблеми"
 msgid "Problems within %.1fkm of this location"
 msgstr "Проблеми в радіусі %.1fkm від цієї точки"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "Проблеми в межах %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "Проблеми в межах %s району"
 
@@ -2611,7 +2828,7 @@ msgstr "Публічна відповідь:"
 msgid "Public response:"
 msgstr "Публічна відповідь:"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2647,11 +2864,11 @@ msgstr "Анкета заповнена автором сповіщення"
 msgid "RSS feed"
 msgstr "RSS потік"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "RSS потік для %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "RSS потік для %s району, %s"
 
@@ -2659,11 +2876,11 @@ msgstr "RSS потік для %s району, %s"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "RSS потік з %s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr ""
 
@@ -2671,13 +2888,13 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr ""
 
@@ -2696,7 +2913,7 @@ msgstr "RSS стрічка з оновленнями по цій проблем
 msgid "Receive email when updates are left on this problem."
 msgstr "Отримувати листа коли інформація по проблемі буде оновлена"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2714,7 +2931,7 @@ msgstr "Нещодавно <br>вирішені"
 msgid "Recently reported problems"
 msgstr "Нещодавно перевідкриті проблеми"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2753,12 +2970,12 @@ msgid "Report"
 msgstr ""
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "Сповістити про проблему"
@@ -2776,6 +2993,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "Звіт по %s"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "Поскаржитись"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2787,7 +3009,7 @@ msgstr ""
 msgid "Report, view, or discuss local problems"
 msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "Сповіщено анонімно по %s"
@@ -2797,7 +3019,7 @@ msgstr "Сповіщено анонімно по %s"
 msgid "Reported before"
 msgstr "Сповіщено раніше"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "Перевідкрито %s о %s"
@@ -2811,27 +3033,27 @@ msgstr ""
 msgid "Reported in the %s category"
 msgstr "Сповіщено в категорії %s "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Сповіщено в категорії %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "Сповіщено в категорію %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "Сповіщено %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "Сповіщено через %s %s о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "Сповіщено через %s в категорію %s анонімно о %s"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "Сповіщено через %s в категорію %s %s о %s"
 
@@ -2855,11 +3077,12 @@ msgstr "Сповістити про проблему"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "Сповіщення"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення."
 
@@ -2867,10 +3090,6 @@ msgstr "Сповіщення обмежені %s символами. Буль л
 msgid "Reports awaiting approval"
 msgstr "Сповіщення очікують підтвердження"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2879,7 +3098,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "Сповіщення опубліковано"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "Сповістити про проблему"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2891,10 +3115,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "Перевідіслати сповіщення"
@@ -2926,6 +3146,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2941,15 +3173,15 @@ msgstr "Обслуговувач цієї дороги (отримано з до
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "Повернули вліво"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -2961,36 +3193,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr ""
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "позначено як дублююче сповіщення"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "Зберети зміни"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "Пошук сповіщень"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "Пошук користувачів"
 
@@ -3017,7 +3257,7 @@ msgstr "Пошук не знайшов користувачів."
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3051,7 +3291,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "Відправити %s %s пізніше"
 
@@ -3064,7 +3304,7 @@ msgstr "Надіслано:"
 msgid "Service:"
 msgstr "Сервіс:"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3072,6 +3312,7 @@ msgstr ""
 msgid "Share"
 msgstr "Поширити"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3081,6 +3322,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3088,23 +3330,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "Показувати старі"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "Показувати моє ім'я публічно"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "Показувати моє ім'я публічно"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Показувати старі"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "Показувати старі"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "Показувати шпильки"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3144,7 +3406,7 @@ msgstr "Деякі фото нещодавніх проблем"
 msgid "Some text to localize"
 msgstr "Певний текст для локалізації"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
@@ -3175,15 +3437,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Вибачте, ми не можем розпізнати це місце. Спробуйте пізніше."
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr ""
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3201,12 +3469,12 @@ msgstr "Початкова дата:"
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "Стан"
@@ -3222,7 +3490,7 @@ msgstr "Стан:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3243,7 +3511,7 @@ msgstr "Все ще відкрито, через анкету, %s"
 msgid "Street View"
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "Підкатегорія: %s"
 
@@ -3271,7 +3539,7 @@ msgstr "Підтвердити"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3328,11 +3596,11 @@ msgstr "Резюме"
 msgid "Summary reports"
 msgstr "Сумарні сповіщення"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3395,7 +3663,7 @@ msgstr "Дякуємо за надіслане фото. Тепер нам по
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "Дякуєм, раді чути, що проблему вирішено! Можемо ми поцікавитись чи сповіщали ви органи про будь-яку проблему раніше?"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Під час завантаження фото трапилась помилка(%s), будь ласка повторіть"
 
@@ -3409,7 +3677,7 @@ msgstr ""
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "Поштовий код не розпізнано, вибачте."
 
@@ -3571,7 +3839,7 @@ msgstr "Сталась проблема з відображенням сторі
 msgid "There was a problem showing this page. Please try again later."
 msgstr "Сталась помилка при спробі показати сторінку. Будь ласка спробуйте пізніше."
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3645,18 +3913,18 @@ msgid ""
 "          A body will not receive any reports unless it covers at least one area."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "Ця інформація обов'язкова"
 
@@ -3672,14 +3940,19 @@ msgstr ""
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "Цю проблему вирішено"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "Цю проблему не вирішено"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "Цю проблему не вирішено"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3727,7 +4000,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3758,8 +4031,26 @@ msgstr "До перегляду точного місцезнаходження
 msgid "Total"
 msgstr "Загалом"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "позначено полагодженим"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3767,7 +4058,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3792,7 +4083,8 @@ msgstr ""
 msgid "Unconfirmed"
 msgstr "Не підтверджено"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr ""
 
@@ -3816,6 +4108,10 @@ msgstr "Невідома помилка"
 msgid "Unknown problem ID"
 msgstr "Невідомий ідентифікатор проблеми"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3872,10 +4168,10 @@ msgstr "Поновити статуси"
 msgid "Updated"
 msgstr "Поновлено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3919,26 +4215,32 @@ msgstr ""
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "Користувацький прапорець видалено"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "Користувач відмічений"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "позначено полагодженим"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "Пошук користувачів знайшов співпадіння в іменах та поштових адресах"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "Користувачі"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -3969,6 +4271,15 @@ msgstr "Переглядаєм локацію"
 msgid "Viewing a problem"
 msgstr "Переглядаєм проблему"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "Райони рад"
@@ -3988,7 +4299,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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; нажаль, наразі у нас немає їх контактних даних. Якщо ви знаєте точну адресу, будь ласка залишайтесь на зв'язку."
 
@@ -4005,6 +4316,10 @@ msgstr "Ми будем використовувати ваші персонал
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr ""
@@ -4022,11 +4337,11 @@ msgstr "Коли відредаговано"
 msgid "When sent"
 msgstr "Коли відправлено"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4061,10 +4376,16 @@ msgstr "Повідомлення, написане суцільними вели
 msgid "Wrong location? Just click again on the map."
 msgstr ""
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "Рік"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4093,6 +4414,10 @@ msgstr "Так, в мене є пароль"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:70
+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 "You are reporting the following problem report for being abusive, containing personal information, or similar:"
@@ -4136,6 +4461,10 @@ msgstr ""
 msgid "You declined; please fill in the box above"
 msgstr "Ви відхилили. Будь ласка заповніть форму вище"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4197,7 +4526,7 @@ msgid "Your Reports"
 msgstr "Ваші сповіщення"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4234,6 +4563,11 @@ msgstr "Ваша інформація буде використана згідн
 msgid "Your name"
 msgstr "Ваше ім'я"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "Ваші сповіщення"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4263,6 +4597,10 @@ msgstr "Ваші сповіщення"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "Ваші поновлення"
@@ -4273,7 +4611,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4281,7 +4619,7 @@ msgstr ""
 msgid "by %s"
 msgstr "від %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "позначено як дублююче сповіщення"
 
@@ -4309,49 +4647,49 @@ msgstr "редагувати користувача"
 msgid "from %s different users"
 msgstr "від %s різних користувачів"
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "останнє поновлення %s"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "менше хвилини"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "позначено дію як заплановану"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "позначено як внутрішній напрямок"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "позначено закритим"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "позначено полагодженим"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "позначено в процесі"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "позначено у вивченні"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "позначено як неможливо полагодити"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "позначено як не відповідальність ради"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "позначено запланованим"
 
@@ -4362,7 +4700,7 @@ msgid "n/a"
 msgstr "недоступно"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4397,8 +4735,8 @@ msgstr "в оригіналі вказано: &ldquo;%s&rdquo;"
 msgid "other areas:"
 msgstr "інші зони:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "перевідкрито"
 
@@ -4419,7 +4757,7 @@ msgstr "місцевий орган"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "шпильки немає так як користувач не використав мапу"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "цей тип локальної проблеми"
 
@@ -4427,6 +4765,16 @@ msgstr "цей тип локальної проблеми"
 msgid "today"
 msgstr "сьогодні"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "Поновлення"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "Поновлення"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "викроистана мапа"
@@ -4444,7 +4792,15 @@ msgstr "користувач є власником проблеми"
 msgid "ward"
 msgstr "двір"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4452,7 +4808,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d днів"
 msgstr[2] "%d днів"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -4460,7 +4816,7 @@ msgstr[0] "%d година"
 msgstr[1] "%d годин"
 msgstr[2] "%d годин"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -4468,6 +4824,14 @@ msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилин"
 msgstr[2] "%d хвилин"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d хвилина"
+msgstr[1] "%d хвилин"
+msgstr[2] "%d хвилин"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
@@ -4476,7 +4840,7 @@ msgstr[0] "%d прибічник"
 msgstr[1] "%d прибічників"
 msgstr[2] "%d прибічників"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4484,6 +4848,14 @@ msgstr[0] "%d тиждень"
 msgstr[1] "%d тижднів"
 msgstr[2] "%d тижднів"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4516,6 +4888,14 @@ msgstr[0] "<big>%s</big> оновлення на звіті"
 msgstr[1] "<big>%s</big> оновлень на звіті"
 msgstr[2] "<big>%s</big> оновлень на звіті"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "Перевідкрито %s о %s"
+msgstr[1] "Перевідкрито %s о %s"
+msgstr[2] "Перевідкрито %s о %s"
+
 #: 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."
@@ -4531,3 +4911,35 @@ msgid_plural "We do not yet have details for the councils that cover this locati
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "останнє поновлення %s"
+msgstr[1] "останнє поновлення %s"
+msgstr[2] "останнє поновлення %s"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "Сповіщення"
+msgstr[1] "Сповіщення"
+msgstr[2] "Сповіщення"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "Всі звіти"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "Створити категорію"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "Перевідкрито %s о %s"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "останнє поновлення %s"
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index 62cd873c0..6cc63a3d5 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/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: 2017-02-02 10:31+0000\n"
+"POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: perllib/FixMyStreet/Script/Reports.pm:197
 msgid " and "
 msgstr "與"
 
@@ -113,11 +113,11 @@ msgstr ""
 "申報給里/區機構，所以會在里/區機關的通告上\n"
 "而在地方政府的公告版上只會出現在轄內通知上"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
 msgid "%s ward, %s"
 msgstr "%s 里/區, %s "
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
+#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296
 msgid "%s, within %s ward"
 msgstr "%s, 在%s 里/區"
 
@@ -165,7 +165,7 @@ msgstr "(己處理)"
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )"
 
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:68
 msgid "(not sent to council)"
 msgstr "不要向地方政府送出"
 
@@ -173,17 +173,17 @@ msgstr "不要向地方政府送出"
 msgid "(optional)"
 msgstr "(任選)"
 
-#: templates/web/base/report/_item.html:59
+#: templates/web/base/report/_item.html:67
 msgid "(sent to both)"
 msgstr "兩個都送出"
 
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:239
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
-#: perllib/FixMyStreet/DB/Result/Problem.pm:439
+#: perllib/FixMyStreet/DB/Result/Problem.pm:454
 msgid "-- Pick a category --"
 msgstr "選擇分類"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:445
+#: perllib/FixMyStreet/DB/Result/Problem.pm:460
 msgid "-- Pick a property type --"
 msgstr "選擇公物種類"
 
@@ -195,6 +195,14 @@ msgstr ""
 msgid "10 inch pothole on Example St, near post box"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:152
+msgid "14-30 days old"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:151
+msgid "7-14 days old"
+msgstr ""
+
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
 msgid ""
@@ -208,12 +216,20 @@ msgstr ""
 "\n"
 "可以在你的設定檔加入一些 <code>地圖連結別</code> "
 
+#: templates/web/base/dashboard/index.html:15
+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')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:37
 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
 msgstr "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s"
 
+#: templates/web/base/js/translation_strings.html:71
+msgid "<span>%s</span> saved."
+msgstr ""
+
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
 msgid "<strong>%s</strong> live problems"
@@ -232,11 +248,11 @@ msgstr "<strong>不</strong> 我要用電子郵件收到更新通知"
 msgid "<strong>No</strong> let me sign in by email"
 msgstr "<strong>不</strong> 我要用電子郵件登入"
 
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/report/_inspect.html:160
 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:162
 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
 msgstr ""
 
@@ -248,6 +264,8 @@ msgstr "<strong>是</strong> 我有密碼"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:6
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Action Scheduled"
@@ -294,15 +312,15 @@ msgstr ""
 msgid "Add user"
 msgstr "新增使用者"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
 msgid "Add/edit problem categories"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
 msgid "Add/edit response priorities"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
 msgid "Add/edit response templates"
 msgstr ""
 
@@ -314,6 +332,10 @@ msgstr "新增 %s"
 msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
 msgstr ""
 
+#: templates/web/base/main_nav_items.html:47
+msgid "Admin"
+msgstr ""
+
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
 msgstr "再一次"
@@ -330,6 +352,12 @@ msgstr "%d 關閉通知 "
 msgid "Alert me to future updates"
 msgstr "通知我此事後續"
 
+#: templates/web/base/dashboard/index.html:138
+#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/index.html:30
+msgid "All"
+msgstr ""
+
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
 msgid "All Reports"
@@ -339,12 +367,14 @@ msgstr "所有事件申報"
 msgid "All Reports as CSV"
 msgstr "所有事件申報存成CSV格式"
 
+#: templates/web/base/admin/category-multiselect.html:5
 #: templates/web/base/admin/responsepriorities/list.html:19
 msgid "All categories"
 msgstr ""
 
-#: templates/web/base/footer.html:29
-#: templates/web/base/reports/_list-filters.html:2
+#: templates/web/base/main_nav_items.html:0
+#: templates/web/base/main_nav_items.html:27
+#: templates/web/base/reports/_list-filters.html:3
 #: templates/web/zurich/admin/index-dm.html:12
 #: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21
 #: templates/web/zurich/nav_over_content.html:6
@@ -379,11 +409,12 @@ msgstr ""
 msgid "Are you a developer?"
 msgstr "你是程式開發者嗎?"
 
-#: templates/web/base/js/translation_strings.html:53
+#: templates/web/base/js/translation_strings.html:56
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:84
+#: templates/web/base/js/translation_strings.html:66
 #: templates/web/base/report/display_tools.html:6
 msgid "Are you sure?"
 msgstr ""
@@ -420,7 +451,7 @@ msgstr "分派給外部機："
 msgid "Assign to subdivision:"
 msgstr "交派給下級單位："
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
 msgid "Assign users to areas"
 msgstr ""
 
@@ -446,15 +477,23 @@ msgid "Auto-response:"
 msgstr ""
 
 #: templates/web/base/admin/report_edit.html:127
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
 msgid "Available categories"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:109
+msgid "Average time to council marking fixed (days)"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:117
+msgid "Average time to first council state change (days)"
+msgstr ""
+
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
 msgstr ""
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:402
+#: perllib/FixMyStreet/DB/Result/Problem.pm:417
 #: templates/web/zurich/report/_item.html:9
 msgid "Awaiting moderation"
 msgstr "待核可"
@@ -472,7 +511,7 @@ msgid "Ban email address"
 msgstr "禁止之電子郵件"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391
 #: templates/web/base/admin/bodies.html:1
 #: templates/web/base/admin/report_edit.html:55
@@ -481,7 +520,7 @@ msgid "Bodies"
 msgstr "有關單位"
 
 #: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:57
+#: templates/web/base/admin/index.html:63
 #: templates/web/base/admin/reports.html:15
 #: templates/web/base/admin/users.html:18
 msgid "Body"
@@ -509,14 +548,15 @@ msgid "Categories"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-multiselect.html:2
 msgid "Categories:"
 msgstr ""
 
 #: templates/web/base/admin/body.html:72
 #: templates/web/base/admin/contact-form.html:19
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:32
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_item.html:90
 #: templates/web/base/report/new/category.html:6
 #: templates/web/base/report/new/category_wrapper.html:3
 #: templates/web/zurich/admin/body.html:14
@@ -527,7 +567,7 @@ msgstr ""
 msgid "Category"
 msgstr "類別"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:852
 msgid "Category changed from ‘%s’ to ‘%s’"
 msgstr ""
 
@@ -537,6 +577,7 @@ msgid "Category fix rate for problems > 4 weeks old"
 msgstr "4週前己修復問題之類別"
 
 #: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/dashboard/index.html:29
 #: templates/web/zurich/admin/body.html:43
 #: templates/web/zurich/admin/contact-form.html:2
 #: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -544,7 +585,7 @@ msgstr "4週前己修復問題之類別"
 msgid "Category:"
 msgstr "類別:"
 
-#: perllib/FixMyStreet/Script/Reports.pm:190
+#: perllib/FixMyStreet/Script/Reports.pm:188
 msgid "Category: %s"
 msgstr "類別: %s"
 
@@ -609,10 +650,14 @@ 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:76
+#: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:65
+msgid "Clear offline data"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
 msgid "Click here or enter as dd/mm/yyyy"
@@ -643,10 +688,12 @@ msgstr "選擇確認電子郵件上的連結以作登入"
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:17
 #: templates/web/base/admin/report_blocks.html:27
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:43
 #: templates/web/base/report/banner.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:18
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:16
@@ -654,11 +701,11 @@ msgstr "選擇確認電子郵件上的連結以作登入"
 msgid "Closed"
 msgstr "關閉"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:809
+#: perllib/FixMyStreet/DB/Result/Problem.pm:889
 msgid "Closed by council"
 msgstr "由地方政府關閉"
 
-#: templates/web/base/reports/_list-filters.html:4
+#: templates/web/base/reports/_list-filters.html:13
 msgid "Closed reports"
 msgstr "完結之申報 "
 
@@ -684,6 +731,11 @@ msgstr "聯合品牌資料:"
 msgid "Cobrand:"
 msgstr "聯合品牌:"
 
+#: templates/web/base/js/translation_strings.html:50
+#, fuzzy
+msgid "Collapse map"
+msgstr "已用過之地圖"
+
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
 msgid "Configuration"
@@ -747,8 +799,8 @@ msgstr "連結本團隊"
 msgid "Coordinates:"
 msgstr "協同單位:"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1668
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1696
 msgid "Could not find user"
 msgstr "找不到該戶用"
 
@@ -766,6 +818,36 @@ msgstr "地方政府"
 msgid "Council contacts for %s"
 msgstr "聯繋地方政府 %s"
 
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:83
+#, fuzzy
+msgid "Council has marked as closed"
+msgstr "標註為關閉"
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:57
+#, fuzzy
+msgid "Council has marked as fixed"
+msgstr "標註為解決"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:80
+#, fuzzy
+msgid "Council has marked as in progress"
+msgstr "標註為處理中"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:82
+#, fuzzy
+msgid "Council has marked as investigating"
+msgstr "標註為調查中"
+
+#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:81
+#, fuzzy
+msgid "Council has marked as planned"
+msgstr "標註為己規畫"
+
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
 msgstr "地方政府流水號　ref:&nbsp;%s"
@@ -790,15 +872,15 @@ msgstr "創建申報"
 msgid "Create category"
 msgstr "創建類別"
 
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 msgid "Create priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
 msgid "Create reports/updates as the council"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
 msgid "Create reports/updates on a user's behalf"
 msgstr ""
 
@@ -842,7 +924,11 @@ msgstr "控制台"
 msgid "Dealt with by subdivision within 5 working days"
 msgstr "下屬單位5個工作天內處理。"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:975
+#: templates/web/base/report/_inspect.html:73
+msgid "Defect type"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
 #: templates/web/zurich/admin/template_edit.html:33
 msgid "Delete template"
@@ -856,6 +942,11 @@ msgstr "刪除模版"
 msgid "Deleted"
 msgstr "刪除"
 
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:59
+msgid "Describe why you are moderating this"
+msgstr ""
+
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
 #: templates/web/zurich/admin/index-sdm.html:20
@@ -892,6 +983,12 @@ msgstr "不使用地圖"
 msgid "Diligency prize league table"
 msgstr "勤奮表現名單"
 
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:61
+#, fuzzy
+msgid "Discard changes"
+msgstr "儲存變動"
+
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
 msgstr ""
@@ -917,23 +1014,25 @@ msgstr "不喜歡此表單？"
 msgid "Down one"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
 msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:10
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "Duplicate"
 msgstr "複製 "
 
-#: templates/web/base/report/_inspect.html:71
+#: templates/web/base/report/_inspect.html:88
 #, fuzzy
 msgid "Duplicate of"
 msgstr "複製 "
 
-#: templates/web/base/report/_inspect.html:81
+#: templates/web/base/report/_inspect.html:98
 #, fuzzy
 msgid "Duplicates"
 msgstr "複製 "
@@ -949,8 +1048,8 @@ msgstr ""
 "不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n"
 "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。"
 
-#: templates/web/base/report/_inspect.html:15
-#: templates/web/base/report/_item.html:73
+#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_item.html:81
 msgid "Easting/Northing:"
 msgstr ""
 
@@ -964,28 +1063,28 @@ msgid "Edit"
 msgstr "編輯"
 
 #: templates/web/base/admin/body.html:140
-#: templates/web/base/admin/index.html:35
+#: templates/web/base/admin/index.html:39
 #: templates/web/zurich/admin/body.html:69
 msgid "Edit body details"
 msgstr "編輯有關單位細節"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
 msgid "Edit other users' details"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
 msgid "Edit other users' permissions"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
 msgid "Edit report category"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
 msgid "Edit report priority"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:707
 msgid "Edit reports"
 msgstr ""
 
@@ -1024,7 +1123,7 @@ msgstr "編輯器"
 msgid "Email"
 msgstr "電子郵件"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1644
 msgid "Email added to abuse list"
 msgstr "電子郵件列入濫發名單"
 
@@ -1042,7 +1141,7 @@ msgstr "建立電郵通知"
 msgid "Email alert deleted"
 msgstr "取消電郵通知"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1641
 msgid "Email already in abuse list"
 msgstr "電子郵件己在濫發名單"
 
@@ -1092,7 +1191,7 @@ msgstr "結束點"
 msgid "Enter a Z&uuml;rich street name"
 msgstr "輸入街道名稱　"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:14
+#: perllib/FixMyStreet/Cobrand/UK.pm:15
 msgid "Enter a nearby UK postcode, or street name and area"
 msgstr "輸入本區的郵編，街名或區域。"
 
@@ -1126,8 +1225,8 @@ msgstr "請在此填寫問題的細節"
 msgid "Error"
 msgstr "錯誤"
 
-#: templates/web/base/reports/_list-filters.html:11
-#: templates/web/base/reports/_list-filters.html:19
+#: templates/web/base/reports/_list-filters.html:20
+#: templates/web/base/reports/_list-filters.html:28
 msgid "Everything"
 msgstr "一切"
 
@@ -1141,14 +1240,23 @@ msgid "Examples:"
 msgstr "範例："
 
 #: templates/web/base/admin/report_edit.html:122
-#: templates/web/base/report/_inspect.html:36
+#: templates/web/base/report/_inspect.html:42
 msgid "Existing category"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:49
+msgid "Expand map"
+msgstr ""
+
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr ""
 
+#: templates/web/base/dashboard/index.html:146
+#, fuzzy
+msgid "Export as CSV"
+msgstr "所有事件申報存成CSV格式"
+
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
 #: templates/web/zurich/admin/header.html:1
@@ -1157,6 +1265,7 @@ msgid "Extern"
 msgstr "外圍"
 
 #: templates/web/base/admin/report_edit.html:97
+#: templates/web/base/admin/responsepriorities/edit.html:27
 msgid "External ID"
 msgstr ""
 
@@ -1177,8 +1286,8 @@ msgstr ""
 msgid "Extra data:"
 msgstr "其它資料："
 
-#: templates/web/base/report/_inspect.html:116
-#: templates/web/base/report/_item.html:98
+#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_item.html:106
 msgid "Extra details"
 msgstr ""
 
@@ -1203,10 +1312,12 @@ msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表
 #: templates/web/base/admin/report_blocks.html:11
 #: templates/web/base/admin/report_blocks.html:26
 #: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/_item.html:41
 #: templates/web/base/report/banner.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:17
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:45
 msgid "Fixed"
@@ -1214,6 +1325,8 @@ msgstr "已處理"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:7
 msgid "Fixed - Council"
 msgstr "已處理－地方政府"
 
@@ -1222,7 +1335,7 @@ msgstr "已處理－地方政府"
 msgid "Fixed - User"
 msgstr "已處理－用戶"
 
-#: templates/web/base/reports/_list-filters.html:5
+#: templates/web/base/reports/_list-filters.html:14
 msgid "Fixed reports"
 msgstr "已處理之申報　"
 
@@ -1231,7 +1344,7 @@ msgid "Fixed:"
 msgstr "已處理:"
 
 #: templates/web/base/admin/body-form.html:95
-#: templates/web/base/admin/responsepriorities/edit.html:31
+#: templates/web/base/admin/responsepriorities/edit.html:41
 #: templates/web/zurich/admin/body-form.html:36
 msgid "Flag as deleted"
 msgstr "標記警告為刪除　"
@@ -1317,11 +1430,13 @@ msgstr "我要訂閱RSS"
 msgid "Glad to hear it’s been fixed!"
 msgstr "很高興聽到問題已處理了。"
 
-#: templates/web/base/admin/index.html:45
+#: templates/web/base/admin/index.html:28
+#: templates/web/base/admin/index.html:34
+#: templates/web/base/admin/index.html:49
 #: templates/web/base/alert/index.html:34
 #: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:53
 #: templates/web/zurich/admin/stats.html:26
 msgid "Go"
 msgstr "走"
@@ -1330,11 +1445,11 @@ msgstr "走"
 msgid "Going to send questionnaire?"
 msgstr "即將送出問卷？"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
 msgid "Grant access to the admin"
 msgstr ""
 
-#: templates/web/base/admin/index.html:70
+#: templates/web/base/admin/index.html:76
 msgid "Graph of problem creation by status over time"
 msgstr "隨時間産生的問題圖片"
 
@@ -1350,7 +1465,7 @@ msgstr "問題已處理了嗎?"
 msgid "Have you ever reported a problem to a council before, or is this your first time?"
 msgstr "您之前是否曾向地方政府申報過問題？或者此為您的首次申報？　"
 
-#: templates/web/base/footer.html:35
+#: templates/web/base/main_nav_items.html:40
 #: templates/web/zurich/about/faq-de-ch.html:1
 #: templates/web/zurich/footer.html:23
 #: templates/web/zurich/nav_over_content.html:8
@@ -1375,6 +1490,9 @@ msgstr "您好 %s"
 #: templates/web/base/admin/report_blocks.html:19
 #: templates/web/base/admin/report_blocks.html:28
 #: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:12
+#: templates/web/base/report/inspect/state_groups_select.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
 #: templates/web/zurich/admin/stats.html:32
@@ -1382,6 +1500,11 @@ msgstr "您好 %s"
 msgid "Hidden"
 msgstr "隱藏"
 
+#: templates/web/base/report/_main.html:105
+#, fuzzy
+msgid "Hide entire report"
+msgstr "重新送出申報"
+
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
 msgstr "隱藏舊文"
@@ -1390,6 +1513,10 @@ msgstr "隱藏舊文"
 msgid "Hide pins"
 msgstr "隱藏地圖標示"
 
+#: templates/web/base/report/update.html:15
+msgid "Hide update completely?"
+msgstr ""
+
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
 msgstr "歷程　"
@@ -1421,7 +1548,7 @@ 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:54
+#: templates/web/base/admin/index.html:60
 #: templates/web/base/admin/list_updates.html:6
 #: templates/web/base/admin/reports.html:12
 #: templates/web/zurich/admin/index-dm.html:21
@@ -1441,6 +1568,10 @@ msgstr ""
 "辨別<strong>上級主責</strong> 如果該有關單位為其它單位的下屬\n"
 "基本安裝中，您不必加入有關單位"
 
+#: templates/web/base/admin/responsepriorities/edit.html:23
+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/contact-form.html:14
 msgid ""
 "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1454,7 +1585,7 @@ msgstr ""
 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/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:33
 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 ""
 
@@ -1525,8 +1656,8 @@ msgstr "無效帳戶"
 msgid "Illegal feed selection"
 msgstr "無效的訂閱選項"
 
-#: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/dashboard/index.html:141
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:43
 msgid "In Progress"
@@ -1544,7 +1675,9 @@ msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送:
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:9
-#: templates/web/base/report/banner.html:19
+#: templates/web/base/report/banner.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:5
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
 msgid "In progress"
@@ -1562,7 +1695,7 @@ msgstr "包括申報人的個人細節"
 msgid "Include unconfirmed reports"
 msgstr "包括未確認的申報 "
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:360
+#: perllib/FixMyStreet/App/Controller/Open311.pm:351
 msgid "Incorrect has_photo value \"%s\""
 msgstr "不正確的照片值數 \"%s\""
 
@@ -1570,7 +1703,7 @@ msgstr "不正確的照片值數 \"%s\""
 msgid "Inspection required"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
 msgid "Instruct contractors to fix problems"
 msgstr ""
 
@@ -1580,33 +1713,41 @@ msgstr "內部筆記"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:11
 msgid "Internal referral"
 msgstr "內部推薦"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:345
+#: templates/web/base/offline/appcache.html:3
+msgid "Internet glitch"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
 msgstr "無效的權責單位數值 %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1502
 msgid "Invalid end date"
 msgstr "無效的結束日期"
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:438
+#: perllib/FixMyStreet/App/Controller/Open311.pm:429
 msgid "Invalid format %s specified."
 msgstr "無效的%s 特定格式"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:384
+#: perllib/FixMyStreet/App/Controller/Report.pm:398
 msgid "Invalid location. New location must be covered by the same council."
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1498
 msgid "Invalid start date"
 msgstr "無效的開始日期"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:4
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:42
 msgid "Investigating"
@@ -1637,6 +1778,15 @@ msgstr "未知的管轄機關"
 msgid "Keep me signed in on this computer"
 msgstr "新增類別承辦人"
 
+#: templates/web/base/dashboard/index.html:50
+msgid "Last 4 weeks"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:49
+#, fuzzy
+msgid "Last 7 days"
+msgstr "上回更新:"
+
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
 msgid "Last editor"
@@ -1650,11 +1800,12 @@ msgstr "上回更新:"
 msgid "Last&nbsp;update:"
 msgstr "上一次更新:"
 
-#: templates/web/base/report/_item.html:78
+#: templates/web/base/report/_inspect.html:20
+#: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
 msgstr ""
 
@@ -1662,6 +1813,10 @@ msgstr ""
 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
 msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\")，此處請保留空白　"
 
+#: templates/web/base/dashboard/index.html:150
+msgid "Less than 7 days old"
+msgstr ""
+
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
 msgstr "列出所有申報的問題　"
@@ -1683,7 +1838,8 @@ msgstr "當地問題訂閱與電郵通知"
 msgid "Local RSS feeds and email alerts for ‘%s’"
 msgstr "當地問題訂閱與電郵通知 %s　"
 
-#: templates/web/base/footer.html:32
+#: templates/web/base/main_nav_items.html:31
+#: templates/web/base/main_nav_items.html:37
 msgid "Local alerts"
 msgstr "當地問題　"
 
@@ -1691,15 +1847,36 @@ msgstr "當地問題　"
 msgid "Locate the problem on a map of the area"
 msgstr "在地圖上標記問題之區域"
 
+#: templates/web/base/auth/general.html:22
+#: templates/web/base/report/new/form_user_loggedout.html:6
+#: templates/web/base/report/update/form_user_loggedout.html:7
+msgid "Log in with Facebook"
+msgstr ""
+
+#: templates/web/base/auth/general.html:30
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/update/form_user_loggedout.html:15
+msgid "Log in with Twitter"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:59
+msgid "Log in with email"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:145
+#: templates/web/base/dashboard/index.html:38
+msgid "Look up"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
 msgstr "地圖"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
 msgid "Manage shortlist"
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
 msgstr ""
 
@@ -1723,7 +1900,7 @@ msgstr "過去八週內標記為已修復/結案情況"
 msgid "Marked fixed/closed more than eight weeks ago"
 msgstr "八週前曾經標記為已修復/結案"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
 msgid "Markup problem details"
 msgstr ""
 
@@ -1743,7 +1920,7 @@ msgstr "給外部機構的訊息"
 msgid "Missing bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Open311.pm:446
+#: perllib/FixMyStreet/App/Controller/Open311.pm:437
 msgid "Missing jurisdiction_id"
 msgstr "遺失 jurisdiction_id"
 
@@ -1751,7 +1928,7 @@ msgstr "遺失 jurisdiction_id"
 msgid "Moderate"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:706
 msgid "Moderate report details"
 msgstr ""
 
@@ -1759,15 +1936,32 @@ msgstr ""
 msgid "Moderate this report"
 msgstr ""
 
+#: templates/web/base/report/update.html:12
+#, fuzzy
+msgid "Moderate this update"
+msgstr "由%s 的 %s 申報"
+
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:49
+#, fuzzy
+msgid "Moderated by %s at %s"
+msgstr "由%s 的 %s 申報"
+
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
 msgstr "一個工作天內協調出部門"
 
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:57
+#, fuzzy
+msgid "Moderation reason:"
+msgstr "其它地區:"
+
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
 msgstr "月份"
 
-#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
 msgid "Most commented"
 msgstr ""
 
@@ -1775,7 +1969,7 @@ msgstr ""
 #: templates/web/base/admin/body-form.html:24
 #: templates/web/base/admin/flagged.html:16
 #: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
 #: templates/web/base/admin/list_updates.html:7
 #: templates/web/base/admin/reports.html:14
 #: templates/web/base/admin/responsepriorities/list.html:6
@@ -1803,7 +1997,7 @@ msgstr "名字："
 msgid "Name: %s"
 msgstr "名字： %s"
 
-#: templates/web/base/report/_inspect.html:22
+#: templates/web/base/report/_inspect.html:28
 msgid "Navigate to this problem"
 msgstr ""
 
@@ -1812,7 +2006,7 @@ msgstr ""
 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
 msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産生): %s%s"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:128
+#: perllib/FixMyStreet/Cobrand/UK.pm:129
 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
 msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)"
 
@@ -1821,7 +2015,7 @@ msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)"
 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:323
+#: perllib/FixMyStreet/Script/Alerts.pm:319
 msgid ""
 "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
 "\n"
@@ -1905,7 +2099,7 @@ msgstr "新陳述"
 msgid "New template"
 msgstr "新模版"
 
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/reports/_list-filters.html:47
 msgid "Newest"
 msgstr ""
 
@@ -1913,6 +2107,7 @@ msgstr ""
 msgid "Next"
 msgstr "下一步"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1203
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
 #: templates/web/base/admin/category_edit.html:4
@@ -1941,7 +2136,7 @@ msgstr "無有關單位"
 msgid "No council"
 msgstr "無地方政府"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:430
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
 msgid "No council selected"
 msgstr "未選擇地方政府"
 
@@ -1959,6 +2154,8 @@ msgstr "未發現標記警告用戶"
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:14
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:8
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "No further action"
@@ -1969,6 +2166,14 @@ msgstr "無法修復"
 msgid "No further updates"
 msgstr "尚無更新"
 
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
+msgid "No inspections by that inspector in the selected date range."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
+msgid "No inspections in the selected date range."
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
 msgstr "查無結果"
@@ -2015,6 +2220,8 @@ msgstr ""
 
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:15
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:9
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/base/report/update/form_update.html:44
 msgid "Not Responsible"
@@ -2076,6 +2283,14 @@ msgstr "現在送出您更新的申報 &hellip; 您是否有本站帳密？"
 msgid "OK"
 msgstr "好了"
 
+#: templates/web/base/js/translation_strings.html:67
+msgid "Offline data cleared"
+msgstr ""
+
+#: templates/web/base/js/translation_strings.html:64
+msgid "Offline update data saved"
+msgstr ""
+
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
 msgstr "老/ 未知 <br>問題 "
@@ -2092,7 +2307,7 @@ msgstr "己解決之舊問題　"
 msgid "Older <br>problems"
 msgstr "舊問題　"
 
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
 msgstr ""
 
@@ -2102,7 +2317,10 @@ msgstr ""
 #: templates/web/base/admin/report_blocks.html:25
 #: templates/web/base/admin/report_blocks.html:6
 #: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:140
+#: templates/web/base/dashboard/index.html:139
+#: templates/web/base/report/inspect/state_groups_select.html:1
+#: templates/web/base/report/inspect/state_groups_select.html:16
+#: templates/web/base/report/inspect/state_groups_select.html:3
 #: templates/web/base/report/update/form_update.html:41
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
@@ -2146,15 +2364,15 @@ msgstr "或將此問題 申報給:"
 msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
 msgstr "您可以訂閱　里/區內的更新通知"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658
 #: perllib/FixMyStreet/App/Controller/Report/New.pm:659
-#: perllib/FixMyStreet/DB/Result/Problem.pm:595
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/Result/Problem.pm:617
-#: perllib/FixMyStreet/DB/Result/Problem.pm:626
-#: perllib/FixMyStreet/Script/Reports.pm:185
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/DB/Result/Problem.pm:642
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:198
 msgid "Other"
 msgstr "其它"
 
@@ -2189,11 +2407,11 @@ msgstr "密碼(任選):"
 msgid "Password:"
 msgstr "密碼:"
 
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:52
 msgid "Permalink"
 msgstr "永久連結"
 
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:144
 msgid "Permissions:"
 msgstr ""
 
@@ -2260,8 +2478,8 @@ msgstr "在地圖上作標記"
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946
 #: templates/web/base/admin/report_blocks.html:1
 #: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/dashboard/index.html:139
 #: templates/web/base/dashboard/index.html:140
-#: templates/web/base/dashboard/index.html:141
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
@@ -2287,14 +2505,14 @@ msgid "Please check your email address is correct"
 msgstr "請確認您電郵地址無誤"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
-#: perllib/FixMyStreet/DB/Result/Problem.pm:441
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:844
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:867
+#: perllib/FixMyStreet/DB/Result/Problem.pm:456
 #: templates/web/base/js/translation_strings.html:9
 msgid "Please choose a category"
 msgstr "請選擇類別"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:447
+#: perllib/FixMyStreet/DB/Result/Problem.pm:462
 msgid "Please choose a property type"
 msgstr "選擇公物種類"
 
@@ -2323,8 +2541,8 @@ msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者
 msgid "Please enter a message"
 msgstr "請寫下您的留言"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1364
 msgid "Please enter a name"
 msgstr ""
 
@@ -2339,13 +2557,13 @@ msgid "Please enter a password"
 msgstr "請輸入密碼"
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:424
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
 #: templates/web/base/js/translation_strings.html:3
 msgid "Please enter a subject"
 msgstr "請填下主旨"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1361
 #: perllib/FixMyStreet/App/Controller/Admin.pm:363
 #: perllib/FixMyStreet/DB/Result/User.pm:164
 #: templates/web/base/js/translation_strings.html:12
@@ -2358,7 +2576,7 @@ msgstr "請輸入有效電子郵件"
 msgid "Please enter a valid email address"
 msgstr "請輸入有效的電子郵件"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:427
+#: perllib/FixMyStreet/DB/Result/Problem.pm:442
 #: templates/web/base/js/translation_strings.html:4
 msgid "Please enter some details"
 msgstr "請填寫進一步細節"
@@ -2385,14 +2603,14 @@ msgstr "請輸入您的電子郵件"
 msgid "Please enter your first name"
 msgstr "請輸入您的大名"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:319
+#: perllib/FixMyStreet/Cobrand/UK.pm:320
 #: templates/web/base/js/translation_strings.html:7
 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.pm:112
 #: perllib/FixMyStreet/DB/Result/Comment.pm:124
-#: perllib/FixMyStreet/DB/Result/Problem.pm:435
+#: perllib/FixMyStreet/DB/Result/Problem.pm:450
 #: perllib/FixMyStreet/DB/Result/User.pm:157
 #: templates/web/base/js/translation_strings.html:6
 msgid "Please enter your name"
@@ -2455,7 +2673,7 @@ msgstr ""
 msgid "Please note:"
 msgstr "請加註記"
 
-#: perllib/FixMyStreet/App/Controller/Report.pm:354
+#: perllib/FixMyStreet/App/Controller/Report.pm:358
 msgid "Please provide a public update for this report."
 msgstr ""
 
@@ -2488,10 +2706,10 @@ msgstr "請選擇更新通知方式"
 msgid "Please state whether or not the problem has been fixed"
 msgstr "請敍明該問題是否已解決"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:165
-#: templates/web/base/js/translation_strings.html:54
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
+#: templates/web/base/js/translation_strings.html:57
 msgid "Please upload an image only"
 msgstr ""
 
@@ -2514,15 +2732,15 @@ msgstr "張貼"
 msgid "Posted anonymously at %s"
 msgstr "匿名張貼  %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
 msgid "Posted by %s at %s"
 msgstr "由 %s 在 %s 張貼"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:250
+#: perllib/FixMyStreet/DB/Result/Comment.pm:252
 msgid "Posted by <strong>%s</strong> (%s) at %s"
 msgstr "由<strong>%s</strong> (%s) 在%s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
 msgid "Posted by <strong>%s</strong> at %s"
 msgstr "由<strong>%s</strong> 在%s"
 
@@ -2538,12 +2756,12 @@ msgstr "之前"
 msgid "Priorities"
 msgstr ""
 
-#: templates/web/base/report/_inspect.html:96
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_inspect.html:113
+#: templates/web/base/report/_item.html:98
 msgid "Priority"
 msgstr ""
 
-#: templates/web/base/footer.html:38
+#: templates/web/base/main_nav_items.html:43
 msgid "Privacy"
 msgstr "隱私"
 
@@ -2586,7 +2804,7 @@ msgstr "%s　問題已送達到地方政府　%s　"
 msgid "Problem breakdown by state"
 msgstr "本站出現故障問題　"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1167
 msgid "Problem marked as open."
 msgstr "問題標註為開放"
 
@@ -2594,7 +2812,7 @@ msgstr "問題標註為開放"
 msgid "Problem state change based on survey results"
 msgstr "依調查結果呈現的問題改善"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:706
+#: perllib/FixMyStreet/Cobrand/Default.pm:705
 #: templates/web/base/admin/flagged.html:10
 msgid "Problems"
 msgstr "問題"
@@ -2615,13 +2833,13 @@ msgstr "FixMyStreet　最近回報的已修復問題　"
 msgid "Problems within %.1fkm of this location"
 msgstr "該地點　%.1f公里內的問題　"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:833
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
-#: perllib/FixMyStreet/Cobrand/UK.pm:208
+#: perllib/FixMyStreet/Cobrand/UK.pm:209
 msgid "Problems within %s"
 msgstr "在 %s 內的問題"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:222
+#: perllib/FixMyStreet/Cobrand/UK.pm:223
 msgid "Problems within %s ward"
 msgstr "在 %s 里/區的問題"
 
@@ -2667,7 +2885,7 @@ msgstr "公眾反應"
 msgid "Public response:"
 msgstr "公眾反應"
 
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:152
 msgid "Public update:"
 msgstr ""
 
@@ -2703,11 +2921,11 @@ msgstr "由問題申報者所填之問卷"
 msgid "RSS feed"
 msgstr "RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
+#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264
 msgid "RSS feed for %s"
 msgstr "%s RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270
 msgid "RSS feed for %s ward, %s"
 msgstr "%s里/區 RSS訂閱"
 
@@ -2715,11 +2933,11 @@ msgstr "%s里/區 RSS訂閱"
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
 msgid "RSS feed of %s"
 msgstr "%s RSS訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
 msgid "RSS feed of %s, within %s ward"
 msgstr "%s, 在%s 里/區"
 
@@ -2727,13 +2945,13 @@ msgstr "%s, 在%s 里/區"
 msgid "RSS feed of nearby problems"
 msgstr " RSS訂閱 %s區域問題"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:835
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
-#: perllib/FixMyStreet/Cobrand/UK.pm:215
+#: perllib/FixMyStreet/Cobrand/UK.pm:216
 msgid "RSS feed of problems within %s"
 msgstr "在 %s 內之問題RSS 訂閱"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
 msgid "RSS feed of problems within %s ward"
 msgstr "在 %s 里/區問題的RSS 訂閱"
 
@@ -2752,7 +2970,7 @@ msgstr "最近當地問題更新的RSS訂閱"
 msgid "Receive email when updates are left on this problem."
 msgstr "透過電子郵件收取該問題之更新消息"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:720
+#: perllib/FixMyStreet/DB/Result/Problem.pm:801
 msgid "Received by %s moments later"
 msgstr ""
 
@@ -2770,7 +2988,7 @@ msgstr "最新 <br>解決"
 msgid "Recently reported problems"
 msgstr "近期申報之問題　"
 
-#: templates/web/base/reports/_list-filters.html:40
+#: templates/web/base/reports/_list-filters.html:49
 msgid "Recently updated"
 msgstr ""
 
@@ -2809,12 +3027,12 @@ msgid "Report"
 msgstr "提報　"
 
 #: templates/web/base/report/_inspect.html:10
-#: templates/web/base/report/_item.html:68
+#: templates/web/base/report/_item.html:76
 msgid "Report ID:"
 msgstr ""
 
-#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2
-#: templates/web/zurich/footer.html:19
+#: templates/web/base/header_logo.html:2
+#: templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19
 #: templates/web/zurich/nav_over_content.html:4
 msgid "Report a problem"
 msgstr "申報問題"
@@ -2832,6 +3050,11 @@ msgstr ""
 msgid "Report on %s"
 msgstr "在%s　申報　"
 
+#: templates/web/base/dashboard/index.html:137
+#, fuzzy
+msgid "Report state:"
+msgstr "已申報 %s"
+
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
 #: templates/web/base/report/new/oauth_email_form.html:1
@@ -2843,7 +3066,7 @@ msgstr "申報你的問題"
 msgid "Report, view, or discuss local problems"
 msgstr "申報，檢視，或討論在地問題"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
 #: templates/web/base/contact/index.html:55
 msgid "Reported anonymously at %s"
 msgstr "在%s 匿名申報 "
@@ -2853,7 +3076,7 @@ msgstr "在%s 匿名申報 "
 msgid "Reported before"
 msgstr "之前的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: perllib/FixMyStreet/DB/Result/Problem.pm:677
 #: templates/web/base/contact/index.html:57
 msgid "Reported by %s at %s"
 msgstr "由%s 的 %s 申報"
@@ -2867,27 +3090,27 @@ msgstr "由　　申報"
 msgid "Reported in the %s category"
 msgstr "%s 種類之申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
 msgid "Reported in the %s category anonymously at %s"
 msgstr "%s 種類下的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
+#: perllib/FixMyStreet/DB/Result/Problem.pm:674
 msgid "Reported in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:600
+#: perllib/FixMyStreet/DB/Result/Problem.pm:647
 msgid "Reported via %s anonymously at %s"
 msgstr "在%s 匿名申報 "
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:624
+#: perllib/FixMyStreet/DB/Result/Problem.pm:671
 msgid "Reported via %s by %s at %s"
 msgstr "%s　透過 %s　在　%s類別的申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:597
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
 msgid "Reported via %s in the %s category anonymously at %s"
 msgstr "透過 %s　在　%s類別的匿名申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
 msgid "Reported via %s in the %s category by %s at %s"
 msgstr "%s 在 %s　%s類別的申報　"
 
@@ -2911,11 +3134,12 @@ msgstr "申報問題"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:655
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383
+#: templates/web/base/dashboard/index.html:134
 #: templates/web/zurich/header.html:52
 msgid "Reports"
 msgstr "申報"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
+#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333
 msgid "Reports are limited to %s characters in length. Please shorten your report"
 msgstr "申請內容有　%s 字數限制，請簡化您的申報。"
 
@@ -2923,10 +3147,6 @@ msgstr "申請內容有　%s 字數限制，請簡化您的申報。"
 msgid "Reports awaiting approval"
 msgstr "待核實之申報"
 
-#: templates/web/base/admin/user-form.html:127
-msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-msgstr ""
-
 #: templates/web/base/admin/user-form.html:107
 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
 msgstr ""
@@ -2935,7 +3155,12 @@ msgstr ""
 msgid "Reports published"
 msgstr "己公開之申報"
 
-#: templates/web/base/admin/index.html:50
+#: templates/web/base/js/translation_strings.html:68
+#, fuzzy
+msgid "Reports saved offline."
+msgstr "申報問題"
+
+#: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
 msgstr ""
 
@@ -2947,10 +3172,6 @@ msgstr ""
 msgid "Reputation threshold"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:130
-msgid "Reputation:"
-msgstr ""
-
 #: templates/web/base/admin/report_edit.html:84
 msgid "Resend report"
 msgstr "重新送出申報"
@@ -2982,6 +3203,18 @@ msgstr ""
 msgid "Response Templates for %s"
 msgstr "%s的回應模版"
 
+#: templates/web/base/report/update.html:40
+msgid "Revert to original"
+msgstr ""
+
+#: templates/web/base/report/_main.html:95
+msgid "Revert to original text"
+msgstr ""
+
+#: templates/web/base/report/_main.html:50
+msgid "Revert to original title"
+msgstr ""
+
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
 msgid "Right place?"
@@ -2997,15 +3230,15 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
 msgid "Road operator for this named road (from OpenStreetMap): %s"
 msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1747
 #: templates/web/base/admin/report_edit.html:163
 #: templates/web/base/admin/update_edit.html:66
 #: templates/web/zurich/admin/report_edit.html:118
 msgid "Rotate Left"
 msgstr "左轉　"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
 #: templates/web/base/admin/report_edit.html:164
 #: templates/web/base/admin/update_edit.html:67
 #: templates/web/zurich/admin/report_edit.html:119
@@ -3017,36 +3250,44 @@ msgid "Rotating this photo will discard unsaved changes to the report."
 msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
 
 #: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:11
+#: templates/web/base/maps/google-ol.html:16
 msgid "Satellite"
 msgstr "衛星"
 
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
 #, fuzzy
 msgid "Save + close as duplicate"
 msgstr "標註為重覆之申報"
 
 #: templates/web/base/admin/contact-form.html:137
-#: templates/web/base/admin/responsepriorities/edit.html:36
+#: templates/web/base/admin/responsepriorities/edit.html:46
 #: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:150
+#: templates/web/base/report/_inspect.html:168
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:60
 #: templates/web/zurich/admin/body.html:62
 #: templates/web/zurich/admin/contact-form.html:20
 #: templates/web/zurich/admin/template_edit.html:29
 msgid "Save changes"
 msgstr "儲存變動"
 
-#: templates/web/base/report/_inspect.html:130
+#: templates/web/base/report/_inspect.html:148
 msgid "Save with a public update"
 msgstr ""
 
-#: templates/web/base/admin/index.html:24
+#. ('This is followed by a progress count, e.g. 3/5')
+#. ("This is followed by a progress count, e.g. 3/5")
+#: templates/web/base/js/translation_strings.html:69
+msgid "Saving reports offline"
+msgstr ""
+
+#: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
 #: templates/web/zurich/admin/reports.html:1
 msgid "Search Reports"
 msgstr "搜尋申報"
 
-#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1
+#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1
 msgid "Search Users"
 msgstr "搜尋使用者"
 
@@ -3073,7 +3314,7 @@ msgstr "查無此用戶"
 msgid "See our privacy policy"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
 msgid "See user detail for reports created as the council"
 msgstr ""
 
@@ -3107,7 +3348,7 @@ msgstr ""
 msgid "Sent report back"
 msgstr "送回申報"
 
-#: perllib/FixMyStreet/DB/Result/Problem.pm:724
+#: perllib/FixMyStreet/DB/Result/Problem.pm:804
 msgid "Sent to %s %s later"
 msgstr "%s 稍後送給%s"
 
@@ -3120,7 +3361,7 @@ msgstr "送出"
 msgid "Service:"
 msgstr "服務"
 
-#: templates/web/base/report/_inspect.html:25
+#: templates/web/base/report/_inspect.html:31
 msgid "Set to my current location"
 msgstr ""
 
@@ -3128,6 +3369,7 @@ msgstr ""
 msgid "Share"
 msgstr "分享"
 
+#: templates/web/base/main_nav_items.html:10
 #: templates/web/base/report/_main.html:136
 #: templates/web/base/report/_main.html:21
 #: templates/web/base/report/_main.html:29
@@ -3137,6 +3379,7 @@ msgstr ""
 #: templates/web/base/report/_main.html:134
 #: templates/web/base/report/_main.html:20
 #: templates/web/base/report/_main.html:25
+#: templates/web/base/reports/_list-filters.html:9
 msgid "Shortlisted"
 msgstr ""
 
@@ -3144,23 +3387,43 @@ msgstr ""
 msgid "Shortlisted by %s"
 msgstr ""
 
+#: templates/web/base/report/update.html:20
+#, fuzzy
+msgid "Show Photo?"
+msgstr "顯示舊文"
+
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
 #: templates/web/base/report/update/form_name.html:33
 msgid "Show my name publicly"
 msgstr "公開我的姓名"
 
+#: templates/web/base/report/update.html:17
+#, fuzzy
+msgid "Show name publicly?"
+msgstr "公開我的姓名"
+
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "顯示舊文"
 
+#: templates/web/base/report/_main.html:79
+#, fuzzy
+msgid "Show photo"
+msgstr "顯示舊文"
+
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
 msgstr "顯示地圖標示"
 
+#: templates/web/base/report/_main.html:60
+msgid "Show reporter&rsquo;s name"
+msgstr ""
+
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:86 templates/web/base/footer.html:26
+#: templates/web/base/auth/general.html:86
+#: templates/web/base/main_nav_items.html:6
 #: templates/web/zurich/auth/general.html:18
 #: templates/web/zurich/auth/general.html:35
 msgid "Sign in"
@@ -3203,7 +3466,7 @@ msgstr "最近申報之照片"
 msgid "Some text to localize"
 msgstr "有些文字需在地化"
 
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:80
 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr "抱歉，該郵區號碼我們尚未支援"
 
@@ -3234,15 +3497,21 @@ msgstr ""
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "抱歉，我們無法解析此地點，請重試一次"
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139
 msgid "Sorry, we couldn't save your image(s), please try again."
 msgstr "抱歉，我們無法儲存你的照片，請重試一次"
 
+#: templates/web/base/offline/appcache.html:5
+msgid ""
+"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
+"page wasn’t found or there was a server error. Please try again later."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
 msgstr ""
 
-#: templates/web/base/reports/_list-filters.html:33
+#: templates/web/base/reports/_list-filters.html:42
 msgid "Sort by"
 msgstr ""
 
@@ -3260,12 +3529,12 @@ msgstr "問始日："
 
 #: templates/web/base/admin/body.html:73
 #: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:58
+#: templates/web/base/admin/index.html:64
 #: templates/web/base/admin/list_updates.html:11
 #: templates/web/base/admin/reports.html:16
 #: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:66
-#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/_inspect.html:83
+#: templates/web/base/report/_item.html:94
 #: templates/web/base/report/update/form_update.html:39
 msgid "State"
 msgstr "陳述"
@@ -3281,7 +3550,7 @@ msgstr "陳述:"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:640
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:386
-#: templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1
+#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
 #: templates/web/base/admin/stats_by_state.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
 msgid "Stats"
@@ -3302,7 +3571,7 @@ msgstr " %s問卷仍開放中"
 msgid "Street View"
 msgstr "街景圖"
 
-#: perllib/FixMyStreet/Script/Reports.pm:194
+#: perllib/FixMyStreet/Script/Reports.pm:192
 msgid "Subcategory: %s"
 msgstr "子類別：%s"
 
@@ -3330,7 +3599,7 @@ msgstr "送出"
 #: templates/web/base/admin/report_edit.html:174
 #: templates/web/base/admin/report_edit.html:24
 #: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:177
+#: templates/web/base/admin/user-form.html:170
 #: templates/web/zurich/admin/report_edit-sdm.html:124
 #: templates/web/zurich/admin/report_edit.html:264
 #: templates/web/zurich/admin/update_edit.html:38
@@ -3387,11 +3656,11 @@ msgstr "摘要"
 msgid "Summary reports"
 msgstr "申報摘要"
 
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:133
 msgid "Superuser:"
 msgstr ""
 
-#: templates/web/base/admin/user-form.html:138
+#: templates/web/base/admin/user-form.html:130
 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
 msgstr ""
 
@@ -3454,7 +3723,7 @@ msgstr "感謝上傳照片，現在需要知道問題的地點位置，請在上
 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
 msgstr "謝謝，很高興知道此問題己修復了。請問您過去是否曾申報過問題？ "
 
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163
 msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 "
 
@@ -3468,7 +3737,7 @@ msgstr "這地點似乎不在台灣; 請再試 一次。"
 
 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
-#: perllib/FixMyStreet/Cobrand/UK.pm:72
+#: perllib/FixMyStreet/Cobrand/UK.pm:73
 msgid "That postcode was not recognised, sorry."
 msgstr "抱歉此郵遞區號無法辨識"
 
@@ -3636,7 +3905,7 @@ msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。"
 msgid "There was a problem showing this page. Please try again later."
 msgstr "本頁出現錯誤，請再試一次"
 
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:758
 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
 #: templates/web/base/auth/general.html:53
 #: templates/web/zurich/auth/general.html:28
@@ -3720,18 +3989,18 @@ msgstr ""
 "此單位只涵蓋 <strong>負責區域</strong>的申報問題處理。　\n"
 "除非其涵蓋至少一個區域，否則政府單位不會接收到問題申報　"
 
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:199
 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
 msgstr "當用戶沒有選擇類別時，電子郵件將送到負責該區域的各地方政府。如果您不是該問題的受理機關，請略過，或讓我們知道該問題的類別以在系統作修正。"
 
-#: perllib/FixMyStreet/Script/Reports.pm:204
+#: perllib/FixMyStreet/Script/Reports.pm:202
 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:882
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
-#: perllib/FixMyStreet/Cobrand/UK.pm:44
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:881
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/Cobrand/UK.pm:45
 msgid "This information is required"
 msgstr "本項資訊必填"
 
@@ -3747,14 +4016,19 @@ msgstr "本站所有申報總結"
 msgid "This pothole has been here for two months and…"
 msgstr ""
 
-#: templates/web/base/report/update/form_update.html:59
+#: templates/web/base/report/update/form_update.html:63
 msgid "This problem has been fixed"
 msgstr "問題己處理完畢"
 
-#: templates/web/base/report/update/form_update.html:53
+#: templates/web/base/report/update/form_update.html:56
 msgid "This problem has not been fixed"
 msgstr "問題尚未解決"
 
+#: templates/web/base/report/update/form_update.html:54
+#, fuzzy
+msgid "This problem is still ongoing"
+msgstr "問題尚未解決"
+
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
 msgstr ""
@@ -3802,7 +4076,7 @@ msgid "Tips for perfect photos"
 msgstr ""
 
 #: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:61
 #: templates/web/base/admin/reports.html:13
 #: templates/web/base/admin/templates.html:10
 msgid "Title"
@@ -3833,8 +4107,26 @@ msgstr "檢視地圖上問題之確切位置"
 msgid "Total"
 msgstr "總數"
 
-#: templates/web/base/report/_inspect.html:107
-#: templates/web/base/report/_item.html:94
+#: templates/web/base/dashboard/index.html:97
+msgid "Total marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:71
+#, fuzzy
+msgid "Total marked as fixed"
+msgstr "標註為解決"
+
+#: templates/web/base/dashboard/index.html:125
+msgid "Total not marked"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:56
+msgid "Total reports received"
+msgstr ""
+
+#: templates/web/base/report/_inspect.html:124
+#: templates/web/base/report/_item.html:102
 msgid "Traffic management required?"
 msgstr ""
 
@@ -3842,7 +4134,7 @@ msgstr ""
 msgid "Trusted by bodies:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:722
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
 msgid "Trusted to make reports that don't need to be inspected"
 msgstr ""
 
@@ -3867,7 +4159,8 @@ msgstr "何不直接發信給我們:"
 msgid "Unconfirmed"
 msgstr "未確認的"
 
-#: templates/web/base/reports/_list-filters.html:3
+#: templates/web/base/reports/_list-filters.html:12
+#: templates/web/base/reports/_list-filters.html:5
 msgid "Unfixed reports"
 msgstr "未處理之申報　"
 
@@ -3891,6 +4184,10 @@ msgstr "未知的錯誤"
 msgid "Unknown problem ID"
 msgstr "未知的問題編號　　"
 
+#: templates/web/base/reports/_list-filters.html:10
+msgid "Unshortlisted"
+msgstr ""
+
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
 msgstr ""
@@ -3947,10 +4244,10 @@ msgstr "更新之狀態"
 msgid "Updated"
 msgstr "已更新"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:824
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1221
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1384
+#: perllib/FixMyStreet/App/Controller/Admin.pm:822
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:787
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:857
@@ -3994,26 +4291,32 @@ msgstr "已用過之地圖"
 msgid "User ID to attribute fetched comments to"
 msgstr ""
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1700
 msgid "User flag removed"
 msgstr "移除用戶的標記警告"
 
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1672
 msgid "User flagged"
 msgstr "給用戶標記警告"
 
+#: templates/web/base/dashboard/index.html:54
+#: templates/web/base/dashboard/index.html:58
+#, fuzzy
+msgid "User has marked as fixed"
+msgstr "標註為解決"
+
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
 msgstr "用戶找到相符的名稱與電子郵件"
 
-#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:669
+#: perllib/FixMyStreet/Cobrand/Default.pm:723
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398
 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
 msgid "Users"
 msgstr "使用者"
 
-#: templates/web/base/admin/user-form.html:149
+#: templates/web/base/admin/user-form.html:141
 msgid "Users can perform the following actions within their assigned body or area."
 msgstr ""
 
@@ -4044,6 +4347,15 @@ msgstr "檢視地區"
 msgid "Viewing a problem"
 msgstr "檢視問題　"
 
+#. ("Week to date")
+#: templates/web/base/dashboard/index.html:48
+msgid "WTD"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:20
+msgid "Ward:"
+msgstr ""
+
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
 msgstr "地方政府轄下的里/區"
@@ -4063,7 +4375,7 @@ msgstr ""
 msgid "We need your email address, please give it below."
 msgstr ""
 
-#: perllib/FixMyStreet/Script/Reports.pm:210
+#: perllib/FixMyStreet/Script/Reports.pm:208
 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之責任，然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊，請告訴我們。"
 
@@ -4080,6 +4392,10 @@ msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政
 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:48
+msgid "Week To Date"
+msgstr ""
+
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
 msgstr "我們會儘快回覆您"
@@ -4097,11 +4413,11 @@ msgstr "何時編輯　"
 msgid "When sent"
 msgstr "何時送出"
 
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
 msgstr ""
 
-#: templates/web/base/js/translation_strings.html:51
+#: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
 msgstr ""
 
@@ -4136,10 +4452,16 @@ msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱
 msgid "Wrong location? Just click again on the map."
 msgstr "錯誤的地? 請再次點擊此地圖"
 
+#. ("Year to date")
+#: templates/web/base/dashboard/index.html:51
+msgid "YTD"
+msgstr ""
+
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
 msgstr "年份"
 
+#: perllib/FixMyStreet/Cobrand/Default.pm:1202
 #: templates/web/base/admin/bodies.html:70
 #: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88
 #: templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94
@@ -4168,6 +4490,10 @@ msgstr "我有密碼"
 msgid "You are complaining that this problem report was unnecessarily moderated:"
 msgstr "你申訴此問題遭不必要之和諧　"
 
+#: templates/web/base/js/translation_strings.html:70
+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 "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題　"
@@ -4214,6 +4540,10 @@ msgstr "您可以刪除某一單位如果不想讓它在本站激活"
 msgid "You declined; please fill in the box above"
 msgstr "您受到拒絕，請填寫上方表格。"
 
+#: templates/web/base/js/translation_strings.html:72
+msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
+msgstr ""
+
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 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"
@@ -4275,7 +4605,7 @@ msgid "Your Reports"
 msgstr "您的申報　"
 
 #: templates/web/base/auth/change_password.html:11
-#: templates/web/base/footer.html:26 templates/web/base/my/my.html:18
+#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
 msgid "Your account"
 msgstr ""
 
@@ -4312,6 +4642,11 @@ msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政
 msgid "Your name"
 msgstr "姓名"
 
+#: templates/web/base/js/translation_strings.html:62
+#, fuzzy
+msgid "Your offline reports"
+msgstr "你作的申報"
+
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
 #: templates/web/base/report/update/form_user_loggedout_password.html:9
@@ -4341,6 +4676,10 @@ msgstr "你作的申報"
 msgid "Your shortlist"
 msgstr ""
 
+#: templates/web/base/js/translation_strings.html:63
+msgid "Your update has been saved offline for submission when back online."
+msgstr ""
+
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
 msgstr "更新"
@@ -4351,7 +4690,7 @@ msgid "Yourself"
 msgstr ""
 
 #: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:151
 msgid "all"
 msgstr ""
 
@@ -4359,7 +4698,7 @@ msgstr ""
 msgid "by %s"
 msgstr "由 %s"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:288
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
 msgid "closed as a duplicate report"
 msgstr "標註為重覆之申報"
 
@@ -4387,49 +4726,49 @@ msgstr "用戶編輯"
 msgid "from %s different users"
 msgstr "從不同的用戶%s  "
 
-#: templates/web/base/report/_item.html:54
+#: templates/web/base/report/_item.html:61
 #: templates/web/zurich/report/_item.html:14
 msgid "last updated %s"
 msgstr "%s上回更新:"
 
-#: perllib/Utils.pm:206
+#: perllib/Utils.pm:227
 msgid "less than a minute"
 msgstr "少於一分鐘"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
 msgid "marked as action scheduled"
 msgstr "標註為排程行動"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:290
+#: perllib/FixMyStreet/DB/Result/Comment.pm:292
 msgid "marked as an internal referral"
 msgstr "標註為內部推薦"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:280
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
 msgid "marked as closed"
 msgstr "標註為關閉"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
-#: perllib/FixMyStreet/DB/Result/Comment.pm:282
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
 msgid "marked as fixed"
 msgstr "標註為解決"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:276
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
 msgid "marked as in progress"
 msgstr "標註為處理中"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:272
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
 msgid "marked as investigating"
 msgstr "標註為調查中"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:284
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
 msgid "marked as no further action"
 msgstr "標註為無法解決"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:286
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
 msgid "marked as not the council's responsibility"
 msgstr "標註為非本區政府職責範圍"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:274
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
 msgid "marked as planned"
 msgstr "標註為己規畫"
 
@@ -4440,7 +4779,7 @@ msgid "n/a"
 msgstr "不適用"
 
 #: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:160
+#: templates/web/base/admin/user-form.html:152
 msgid "none"
 msgstr ""
 
@@ -4475,8 +4814,8 @@ msgstr "原始輸入者"
 msgid "other areas:"
 msgstr "其它地區:"
 
-#: perllib/FixMyStreet/DB/Result/Comment.pm:263
-#: perllib/FixMyStreet/DB/Result/Comment.pm:269
+#: perllib/FixMyStreet/DB/Result/Comment.pm:265
+#: perllib/FixMyStreet/DB/Result/Comment.pm:271
 msgid "reopened"
 msgstr "重啟申報"
 
@@ -4497,7 +4836,7 @@ msgstr "當地地府"
 msgid "there is no pin shown as the user did not use the map"
 msgstr "地圖上無標記，用戶未使用地圖"
 
-#: perllib/FixMyStreet/Script/Reports.pm:186
+#: perllib/FixMyStreet/Script/Reports.pm:184
 msgid "this type of local problem"
 msgstr "此類在地問題"
 
@@ -4505,6 +4844,16 @@ msgstr "此類在地問題"
 msgid "today"
 msgstr "今天"
 
+#: templates/web/base/js/translation_strings.html:73
+#, fuzzy
+msgid "update"
+msgstr "更新"
+
+#: templates/web/base/js/translation_strings.html:74
+#, fuzzy
+msgid "updates"
+msgstr "更新"
+
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
 msgstr "已用過之地圖"
@@ -4522,36 +4871,54 @@ msgstr "%d 天數"
 msgid "ward"
 msgstr "路檔"
 
-#: perllib/Utils.pm:223
+#: templates/web/base/admin/bodies.html:56
+#, perl-format
+msgid "%d address"
+msgid_plural "%d addresses"
+msgstr[0] ""
+
+#: perllib/Utils.pm:250
 #, perl-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日期"
 
-#: perllib/Utils.pm:225
+#: perllib/Utils.pm:252
 #, perl-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時數"
 
-#: perllib/Utils.pm:227
+#: perllib/Utils.pm:254
 #, perl-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分鐘數"
 
+#: perllib/Utils.pm:246
+#, fuzzy, perl-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d 分鐘數"
+
 #: templates/web/base/report/_support.html:6
 #, perl-format
 msgid "%d supporter"
 msgid_plural "%d supporters"
 msgstr[0] "%d 支援者"
 
-#: perllib/Utils.pm:221
+#: perllib/Utils.pm:248
 #, perl-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週數"
 
+#: perllib/Utils.pm:244
+#, perl-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
 #: templates/web/base/front/stats.html:19
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
@@ -4576,6 +4943,12 @@ msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] "<big>%s</big> 更新申報"
 
+#: templates/web/base/report/_item.html:49
+#, fuzzy, perl-format
+msgid "Reported %d day ago"
+msgid_plural "Reported %d days ago"
+msgstr[0] "由%s 的 %s 申報"
+
 #: 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."
@@ -4587,3 +4960,35 @@ msgstr[0] "我們<strong>尚未<strong>有該區域其它單位之細節　"
 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] "我們尚未有該區域負責單位之細節　"
+
+#: templates/web/base/report/_item.html:59
+#, fuzzy, perl-format
+msgid "last updated %d day ago"
+msgid_plural "last updated %d days ago"
+msgstr[0] "%s上回更新:"
+
+#: templates/email/oxfordshire/archive.txt:9
+#, fuzzy, perl-format
+msgid "report"
+msgid_plural "reports"
+msgstr[0] "提報　"
+
+#, fuzzy
+#~ msgid "All inspectors"
+#~ msgstr "所有事件申報"
+
+#, fuzzy
+#~ msgid "External ID:"
+#~ msgstr "外部網址"
+
+#, fuzzy
+#~ msgid "Report category:"
+#~ msgstr "創建類別"
+
+#, fuzzy
+#~ msgid "Reported %d days ago"
+#~ msgstr "由%s 的 %s 申報"
+
+#, fuzzy
+#~ msgid "last updated %d days ago"
+#~ msgstr "%s上回更新:"
-- 
cgit v1.2.3


From ed850c6d928acfa6898d67a9220b00ade64b45ea Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 31 Mar 2017 14:23:02 +0100
Subject: [SeeSomething] Remove cobrand.

---
 .gitignore                                         |   1 -
 perllib/FixMyStreet/App/Controller/Admin.pm        |   2 +-
 perllib/FixMyStreet/Cobrand/SeeSomething.pm        | 135 ---------------------
 perllib/FixMyStreet/SendReport/Email.pm            |   9 +-
 t/app/controller/report_new.t                      | 115 ------------------
 t/cobrand/seesomething.t                           |  87 -------------
 templates/web/seesomething/admin/footer.html       |   7 --
 templates/web/seesomething/admin/header.html       |   2 -
 templates/web/seesomething/admin/stats.html        |  63 ----------
 .../web/seesomething/around/display_location.html  |  52 --------
 templates/web/seesomething/around/index.html       |  24 ----
 .../web/seesomething/around/postcode_form.html     |  17 ---
 templates/web/seesomething/auth/general.html       |  46 -------
 templates/web/seesomething/auth/sign_out.html      |   7 --
 templates/web/seesomething/footer.html             |  15 ---
 templates/web/seesomething/front/stats.html        |   0
 templates/web/seesomething/front/tips.html         |   5 -
 templates/web/seesomething/header_extra.html       |   1 -
 templates/web/seesomething/index.html              |  42 -------
 .../web/seesomething/js/translation_strings.html   |  15 ---
 templates/web/seesomething/main_nav_items.html     |   3 -
 templates/web/seesomething/report/display.html     |   9 --
 .../web/seesomething/report/new/category.html      |  15 ---
 .../report/new/fill_in_details_form.html           | 106 ----------------
 templates/web/seesomething/set_body_class.html     |   1 -
 templates/web/seesomething/site-name.html          |   1 -
 .../web/seesomething/tokens/confirm_problem.html   |  33 -----
 27 files changed, 2 insertions(+), 811 deletions(-)
 delete mode 100644 perllib/FixMyStreet/Cobrand/SeeSomething.pm
 delete mode 100644 t/cobrand/seesomething.t
 delete mode 100644 templates/web/seesomething/admin/footer.html
 delete mode 100644 templates/web/seesomething/admin/header.html
 delete mode 100644 templates/web/seesomething/admin/stats.html
 delete mode 100644 templates/web/seesomething/around/display_location.html
 delete mode 100644 templates/web/seesomething/around/index.html
 delete mode 100644 templates/web/seesomething/around/postcode_form.html
 delete mode 100644 templates/web/seesomething/auth/general.html
 delete mode 100644 templates/web/seesomething/auth/sign_out.html
 delete mode 100644 templates/web/seesomething/footer.html
 delete mode 100644 templates/web/seesomething/front/stats.html
 delete mode 100644 templates/web/seesomething/front/tips.html
 delete mode 100644 templates/web/seesomething/header_extra.html
 delete mode 100644 templates/web/seesomething/index.html
 delete mode 100644 templates/web/seesomething/js/translation_strings.html
 delete mode 100644 templates/web/seesomething/main_nav_items.html
 delete mode 100644 templates/web/seesomething/report/display.html
 delete mode 100644 templates/web/seesomething/report/new/category.html
 delete mode 100644 templates/web/seesomething/report/new/fill_in_details_form.html
 delete mode 100644 templates/web/seesomething/set_body_class.html
 delete mode 100644 templates/web/seesomething/site-name.html
 delete mode 100644 templates/web/seesomething/tokens/confirm_problem.html

diff --git a/.gitignore b/.gitignore
index 0885b0361..fc1d063c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ FixMyBarangay.po
 /web/css/main.css
 /web/cobrands/*/*.css
 /web/cobrands/*/*.css.map
-/web/cobrands/seesomething
 *.auto.min.js
 
 # Photo upload cache
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 87a4191af..d37e0b39c 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1484,7 +1484,7 @@ sub stats : Path('stats') : Args(0) {
         $selected_body = $c->user->from_body->id;
     }
 
-    if ( $c->cobrand->moniker eq 'seesomething' || $c->cobrand->moniker eq 'zurich' ) {
+    if ( $c->cobrand->moniker eq 'zurich' ) {
         return $c->cobrand->admin_stats();
     }
 
diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm
deleted file mode 100644
index 4d4dd000e..000000000
--- a/perllib/FixMyStreet/Cobrand/SeeSomething.pm
+++ /dev/null
@@ -1,135 +0,0 @@
-package FixMyStreet::Cobrand::SeeSomething;
-use parent 'FixMyStreet::Cobrand::UKCouncils';
-
-use strict;
-use warnings;
-
-sub council_id { return [ 2520, 2522, 2514, 2546, 2519, 2538, 2535 ]; }
-sub council_area { return 'West Midlands'; }
-sub council_name { return 'See Something Say Something'; }
-sub council_url { return 'seesomething'; }
-sub area_types  { [ 'MTD' ] }
-
-sub area_check {
-    my ( $self, $params, $context ) = @_;
-
-    my $councils = $params->{all_areas};
-    my $council_match = grep { $councils->{$_} } @{ $self->council_id };
-
-    if ($council_match) {
-        return 1;
-    }
-
-    return ( 0, "That location is not covered by See Something, Say Something" );
-}
-
-sub disambiguate_location {
-    my $self    = shift;
-    my $string  = shift;
-
-    my $town = 'West Midlands';
-
-    return {
-        %{ $self->SUPER::disambiguate_location() },
-        town => $town,
-        centre => '52.4803101685267,-2.2708272758854',
-        span   => '1.4002794815887,2.06340043925997',
-        bounds => [ 51.8259444771676, -3.23554082684068, 53.2262239587563, -1.17214038758071 ],
-    };
-}
-
-sub example_places {
-    return ( 'WS1 4NH', 'Austin Drive, Coventry' );
-}
-
-sub send_questionnaires {
-    return 0;
-}
-
-sub ask_ever_reported {
-    return 0;
-}
-
-sub report_sent_confirmation_email { 1; }
-
-sub report_check_for_errors { return (); }
-
-sub never_confirm_reports { 1; }
-
-sub allow_anonymous_reports { 1; }
-
-sub anonymous_account { return { name => 'Anonymous Submission', email => FixMyStreet->config('DO_NOT_REPLY_EMAIL') }; }
-
-sub admin_allow_user {
-    my ( $self, $user ) = @_;
-    return 1 if ( $user->from_body || $user->is_superuser );
-}
-
-sub admin_pages {
-    my $self = shift;
-
-    return {
-        'stats' => ['Reports', 0],
-    };
-};
-
-sub admin_stats {
-    my $self = shift;
-    my $c = $self->{c};
-
-    my %filters = ();
-
-    # XXX The below lookup assumes a body ID === MapIt area ID
-    my %councils =
-        map {
-            my $name = $_->name;
-            $name =~ s/(?:Borough|City) Council//;
-            ($_->id => $name);
-        }
-        $c->model('DB::Body')->search({ id => $self->council_id });
-
-    $c->stash->{council_details} = \%councils;
-
-    if ( !$c->user_exists || !grep { $_ == $c->user->from_body->id } @{ $self->council_id } ) {
-        $c->detach( '/page_error_404_not_found' );
-    }
-
-    if ( $c->get_param('category') ) {
-        $filters{category} = $c->get_param('category');
-        $c->stash->{category} = $c->get_param('category');
-    }
-
-    if ( $c->get_param('subcategory') ) {
-        $filters{subcategory} = $c->get_param('subcategory');
-        $c->stash->{subcategory} = $c->get_param('subcategory');
-    }
-
-    if ( $c->get_param('service') ) {
-        $filters{service} = { -ilike => $c->get_param('service') };
-        $c->stash->{service} = $c->get_param('service');
-    }
-
-    my $page = $c->get_param('p') || 1;
-
-    my $p = $c->model('DB::Problem')->search(
-        {
-            confirmed => { not => undef },
-            %filters
-        },
-        {
-            columns => [ qw(
-                service category subcategory confirmed bodies_str
-            ) ],
-            order_by => { -desc=> [ 'confirmed' ] },
-            rows => 20,
-        }
-    )->page( $page );
-
-    $c->stash->{reports} = $p;
-    $c->stash->{pager} = $p->pager;
-
-    return 1;
-}
-
-1;
-
diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm
index 9abccf510..28f3411d0 100644
--- a/perllib/FixMyStreet/SendReport/Email.pm
+++ b/perllib/FixMyStreet/SendReport/Email.pm
@@ -29,13 +29,6 @@ sub build_recipient_list {
             $self->unconfirmed_notes->{$body_email}{$row->category} = $note;
         }
 
-        my $body_name = $body->name;
-        # see something uses council areas but doesn't send to councils so just use a
-        # generic name here to minimise confusion
-        if ( $row->cobrand eq 'seesomething' ) {
-            $body_name = 'See Something, Say Something';
-        }
-
         my @emails;
         # allow multiple emails per contact
         if ( $body_email =~ /,/ ) {
@@ -44,7 +37,7 @@ sub build_recipient_list {
             @emails = ( $body_email );
         }
         for my $email ( @emails ) {
-            push @{ $self->to }, [ $email, $body_name ];
+            push @{ $self->to }, [ $email, $body->name ];
         }
     }
 
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index fd3108438..71090cd26 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -1363,121 +1363,6 @@ subtest "test Hart" => sub {
     }
 };
 
-subtest "test SeeSomething" => sub {
-    $mech->host('seesomething.fixmystreet.com');
-    $mech->clear_emails_ok;
-    $mech->log_out_ok;
-
-    my $cobrand = FixMyStreet::Cobrand::SeeSomething->new();
-
-    my $body_ss = $mech->create_body_ok(2535, 'Sandwell Borough Council', id => 2535);
-    my $bus_contact = $mech->create_contact_ok(
-        body_id => $body_ss->id,
-        category => 'Bus',
-        email => 'bus@example.com',
-        non_public => 1,
-    );
-
-    for my $test ( {
-            desc => 'report with no user details works',
-            pc => 'WS1 4NH',
-            fields => {
-                detail => 'Test report details',
-                category => 'Bus',
-                subcategory => 'Smoking',
-            },
-            email => $cobrand->anonymous_account->{email},
-        },
-        {
-            desc => 'report with user details works',
-            pc => 'WS1 4NH',
-            fields => {
-                detail => 'Test report details',
-                category => 'Bus',
-                subcategory => 'Smoking',
-                email => 'non_anon_user@example.com',
-                name => 'Non Anon',
-            },
-            email => 'non_anon_user@example.com',
-        },
-        {
-            desc => 'report with public category',
-            pc => 'WS1 4NH',
-            fields => {
-                detail => 'Test report details',
-                category => 'Bus',
-                subcategory => 'Smoking',
-            },
-            email => $cobrand->anonymous_account->{email},
-            public => 1,
-        }
-    ) {
-        subtest $test->{desc} => sub {
-            $mech->clear_emails_ok;
-            my $user =
-              FixMyStreet::App->model('DB::User')->find( { email => $test->{email} } );
-
-            if ( $user ) {
-                $user->alerts->delete;
-                $user->problems->delete;
-                $user->delete;
-            }
-
-            if ( $test->{public} ) {
-                $bus_contact->non_public(0);
-                $bus_contact->update;
-            } else {
-                $bus_contact->non_public(1);
-                $bus_contact->update;
-            }
-
-            $mech->get_ok( '/around' );
-            FixMyStreet::override_config {
-                ALLOWED_COBRANDS => [ 'seesomething' ],
-                MAPIT_URL => 'http://mapit.uk/',
-            }, sub {
-                $mech->submit_form_ok(
-                    {
-                        with_fields => {
-                            pc => $test->{pc},
-                        },
-                    },
-                    'submit around form',
-                );
-                $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" );
-
-                $mech->submit_form_ok(
-                    {
-                        with_fields => $test->{fields},
-                    },
-                    'Submit form details with no user details',
-                );
-            };
-            is_deeply $mech->page_errors, [], "check there were no errors";
-
-            $user =
-              FixMyStreet::App->model('DB::User')->find( { email => $test->{email} } );
-            ok $user, "user found";
-
-            my $report = $user->problems->first;
-            ok $report, "Found the report";
-
-            $mech->email_count_is(0);
-
-            ok $report->confirmed, 'Report is confirmed automatically';
-
-            is $mech->uri->path, '/report/new', 'stays on report/new page';
-            $mech->content_contains( 'Your report has been sent', 'use report created template' );
-
-            $user->alerts->delete;
-            $user->problems->delete;
-            $user->delete;
-        };
-    }
-
-    $bus_contact->delete;
-};
-
 subtest "categories from deleted bodies shouldn't be visible for new reports" => sub {
     FixMyStreet::override_config {
         ALLOWED_COBRANDS => [ { fixmystreet => '.' } ],
diff --git a/t/cobrand/seesomething.t b/t/cobrand/seesomething.t
deleted file mode 100644
index 4da1c9c6e..000000000
--- a/t/cobrand/seesomething.t
+++ /dev/null
@@ -1,87 +0,0 @@
-use strict;
-use warnings;
-use DateTime;
-use Test::More;
-
-use FixMyStreet;
-use FixMyStreet::TestMech;
-
-my $EMAIL = 'seesomething@example.com';
-
-my $mech = FixMyStreet::TestMech->new;
-my $db = FixMyStreet::DB->storage->schema;
-my $dt_parser = $db->storage->datetime_parser;
-
-$db->txn_begin;
-
-$db->resultset('Comment')->delete;
-$db->resultset('Problem')->delete;
-
-my $user = $mech->create_user_ok( $EMAIL );
-
-my $body = $mech->create_body_ok( 2520, 'Coventry City Council', id => 2520 );
-$mech->create_body_ok( 2522, 'Dudley Borough Council' );
-$mech->create_body_ok( 2514, 'Birmingham City Council' );
-$mech->create_body_ok( 2546, 'Walsall Borough Council' );
-$mech->create_body_ok( 2519, 'Wolverhampton City Council' );
-$mech->create_body_ok( 2538, 'Solihull Borough Council' );
-$mech->create_body_ok( 2535, 'Sandwell Borough Council' );
-
-$user->update({ from_body => $body });
-
-my $date = $dt_parser->format_datetime(DateTime->now);
-
-my $report = FixMyStreet::DB->resultset('Problem')->find_or_create( {
-    postcode           => 'EH1 1BB',
-    bodies_str         => '2520',
-    areas              => ',2520,',
-    service            => 'Android',
-    category           => 'Bus',
-    subcategory        => 'Loud Music',
-    title              => 'Loud Music',
-    detail             => 'Loud Music',
-    used_map           => 1,
-    name               => 'SeeSomething Test User',
-    anonymous          => 0,
-    state              => 'confirmed',
-    confirmed          => $date,
-    lang               => 'en-gb',
-    cobrand            => 'default',
-    cobrand_data       => '',
-    send_questionnaire => 1,
-    latitude           => '52.4081',
-    longitude          => '-1.5106',
-    user_id            => $user->id,
-} );
-
-subtest 'admin/stats' => sub {
-    FixMyStreet::override_config {
-        ALLOWED_COBRANDS => [ 'seesomething' ],
-    }, sub {
-        my $user = $mech->log_in_ok( $EMAIL );
-
-        $mech->get( '/admin/stats' );
-        if (ok $mech->success) {
-
-            $date =~s/ /&nbsp;/;
-            $date =~s/\+0000//;
-            my $xml = <<EOXML;
-        <tr>
-            <td>Android</td>
-            <td>Bus</td>
-            <td class="nowrap">Loud Music</td>
-            <td class="nowrap">Coventry </td>
-            <td class="nowrap">$date</td>
-        </tr>
-EOXML
-            $mech->content_contains($xml);
-        }
-        else {
-            diag $mech->content;
-            diag $mech->status;
-        };
-    }
-};
-
-$db->txn_rollback;
-done_testing;
diff --git a/templates/web/seesomething/admin/footer.html b/templates/web/seesomething/admin/footer.html
deleted file mode 100644
index bdd42e2e4..000000000
--- a/templates/web/seesomething/admin/footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-<!-- [% INCLUDE 'debug_footer.html' %] -->
-    </div> <!-- .wrapper -->
-</body>
-</html>
diff --git a/templates/web/seesomething/admin/header.html b/templates/web/seesomething/admin/header.html
deleted file mode 100644
index 40bea25bf..000000000
--- a/templates/web/seesomething/admin/header.html
+++ /dev/null
@@ -1,2 +0,0 @@
-[% INCLUDE 'header.html' admin = 1, bodyclass = 'admin fullwidthpage' %]
-    <h1>[% title %]</h1>
diff --git a/templates/web/seesomething/admin/stats.html b/templates/web/seesomething/admin/stats.html
deleted file mode 100644
index 155bff472..000000000
--- a/templates/web/seesomething/admin/stats.html
+++ /dev/null
@@ -1,63 +0,0 @@
-[% INCLUDE 'admin/header.html' title=loc('Reports') %]
-[% PROCESS 'admin/report_blocks.html' %]
-
-[% BLOCK options %]
-    [% FOR option IN option_list %]
-        <option value="[% option %]"[% ' selected' IF selected == option %]>[% option %]</opytion>
-    [% END %]
-[% END %]
-
-<form method="post" action="[% c.uri_for('stats') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8" id="filter-form">
-    <label for="form_category">Transport Type: </label>
-    <select class="form-control" name="category" id="form_category">
-        <option value="">Select</option>
-        [% PROCESS options, option_list = [ 'Bus', 'Metro', 'Train' ], selected = category %]
-    </select>
-
-    <label for="form_subcategory">Incident Type: </label>
-    <select class="form-control" name="subcategory" id="form_subcategory">
-        <option value="">Select</option>
-        [% PROCESS options, option_list = ['Smoking', 'Drugs', 'Anti-social Behaviour', 'Loud Music', 'Damage', 'Feet on Seats', 'Other'], selected = subcategory %]
-    </select>
-
-    <label for="form_service">Device: </label>
-    <select class="form-control" name="service" id="form_service">
-        <option value="">Select</option>
-        [% PROCESS options, option_list = [ 'Android', 'iPhone' ], selected = service %]
-    </select>
-
-    <input type="submit" class="btn" name="getcounts"  size="30" id="getcounts" value="Look Up" />
-</form>
-
-[% IF pager.total_entries == 0 %]
-<p align="center">
-No Results found
-</p>
-[% ELSE %]
-<table class="admin-report">
-    <thead>
-        <tr>
-            <th>Device</th>
-            <th>Transport Category</th>
-            <th>Incident Category</th>
-            <th>Area</th>
-            <th>Submitted</th>
-        </tr>
-    </thead>
-    <tbody>
-        [%- WHILE (report = reports.next) %]
-        <tr>
-            <td>[% report.service || 'Other' %]</td>
-            <td>[% report.category %]</td>
-            <td class="nowrap">[% report.subcategory %]</td>
-            <td class="nowrap">[% council_details.${report.bodies_str} %]</td>
-            <td class="nowrap">[% PROCESS format_time time=report.confirmed %]</td>
-        </tr>
-        [%- END %]
-    </tbody>
-</table>
-[% END %]
-
-[% INCLUDE 'pagination.html', param = 'p' %]
-
-[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html
deleted file mode 100644
index 7886c3a5d..000000000
--- a/templates/web/seesomething/around/display_location.html
+++ /dev/null
@@ -1,52 +0,0 @@
-[%
-
-    url_skip = c.uri_for(
-        '/report/new',
-        {
-            pc         => pc
-            latitude   => latitude,
-            longitude  => longitude,
-            skipped    => 1,
-        }
-    );
-
-    PROCESS "maps/${map.type}.html";
-    sidebar_html = PROCESS 'report/new/sidebar.html', js = 1, report.used_map = 1;
-
-    INCLUDE 'header.html',
-        title  => loc('Viewing a location')
-        bodyclass => 'mappage',
-        robots => 'noindex,nofollow';
-
-%]
-
-<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data" class="validate" novalidate>
-    <input type="hidden" name="token" value="[% csrf_token %]">
-    [% IF c.req.params.map_override %]
-        <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]">
-    [% END %]
-    <input type="hidden" name="pc" value="[% pc | html %]">
-
-    <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]">
-    <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]">
-
-    [% map_html %]
-    </div>
-
-    <div id="map_sidebar">
-        <div id="side">
-            [% INCLUDE 'around/_report_banner.html' %]
-        </div>
-
-        <div style="display:none" id="side-form">
-        [% INCLUDE "report/new/fill_in_details_form.html"
-            js = 1,
-            report.used_map = 1
-            report.name = c.user.name
-        %]
-        </div>
-    </div>
-
-</form>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/seesomething/around/index.html b/templates/web/seesomething/around/index.html
deleted file mode 100644
index a143e90a2..000000000
--- a/templates/web/seesomething/around/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass = 'mappage' %]
-
-<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
-    <div id="side-form">
-        <div id="report-a-problem-main">
-            [% INCLUDE 'around/postcode_form.html' %]
-
-            [% IF location_error %]
-                <p class="error">[% location_error %]</p>
-            [% END %]
-
-            [% IF possible_location_matches %]
-                <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p>
-                <ul class="pc_alternatives">
-                    [% FOREACH match IN possible_location_matches %]
-                    <li><a href="/around?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li>
-                    [% END %]
-                </ul>
-            [% END %]
-        </div>
-    </div>
-</form>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/seesomething/around/postcode_form.html b/templates/web/seesomething/around/postcode_form.html
deleted file mode 100644
index 56fcdca97..000000000
--- a/templates/web/seesomething/around/postcode_form.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="front-main">
-    <div id="front-main-container">
-        [%
-            question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area');
-        %]
-
-            <label for="pc">[% question %]:</label>
-            <div>
-                <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
-                <input type="submit" value="[% loc('Go') %]" id="submit">
-            </div>
-
-            [% IF partial_token %]
-                <input type="hidden" name="partial" value="[% partial_token.token %]">
-            [% END %]
-    </div>
-</div>
diff --git a/templates/web/seesomething/auth/general.html b/templates/web/seesomething/auth/general.html
deleted file mode 100644
index 09639d15b..000000000
--- a/templates/web/seesomething/auth/general.html
+++ /dev/null
@@ -1,46 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Sign in or create an account') %]
-
-<h1>[% loc('Sign in') %]</h1>
-
-<form action="[% c.uri_for() %]" method="post" name="general_auth" class="validate">
-    <fieldset>
-        <input type="hidden" name="r" value="[% c.req.params.r | html %]">
-
-            [% IF email_error;
-
-                # other keys include fqdn, mxcheck if you'd like to write a custom error message
-
-                errors = {
-                    missing => loc('Please enter your email'),
-                    other   => loc('Please check your email address is correct')
-                };
-
-                loc_email_error = errors.$email_error || errors.other;
-            END %]
-        <label class="n" for="email">[% loc('Email') %]</label>
-        [% IF loc_email_error  %]
-            <div class="form-error">[% loc_email_error %]</div>
-        [% ELSIF sign_in_error %]
-            <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form.') %]</div>
-        [% END %]
-        <input type="email" class="form-control required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]">
-
-        <div class="form-txt-submit-box">
-            <label class="n" for="password_sign_in">Password</label>
-            <input type="password" class="form-control" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]">
-        </div>
-
-        <div class="form-txt-submit-box">
-            <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]>
-            <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
-        </div>
-
-        <div class="form-txt-submit-box">
-            <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]">
-        </div>
-
-    </fieldset>
-</form>
-
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/seesomething/auth/sign_out.html b/templates/web/seesomething/auth/sign_out.html
deleted file mode 100644
index ef1d11b58..000000000
--- a/templates/web/seesomething/auth/sign_out.html
+++ /dev/null
@@ -1,7 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
-
-<h1>[% loc('You have been signed out') %]</h1>
-
-<p>Please feel free to <a href="[% c.uri_for('/auth', { r => 'admin/stats' } ) %]">sign in again</a></p>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/seesomething/footer.html b/templates/web/seesomething/footer.html
deleted file mode 100644
index 6fd0f42b2..000000000
--- a/templates/web/seesomething/footer.html
+++ /dev/null
@@ -1,15 +0,0 @@
-                </div><!-- .content role=main -->
-            </div><!-- .container -->
-        </div><!-- .table-cell -->
-
-        <div class="nav-wrapper">
-            <div class="nav-wrapper-2">
-                [% INCLUDE "main_nav.html" hide_mysoc_link=1 %]
-            </div>
-        </div>
-    </div> <!-- .wrapper -->
-
-    [% INCLUDE 'common_footer_tags.html' %]
-
-</body>
-</html>
diff --git a/templates/web/seesomething/front/stats.html b/templates/web/seesomething/front/stats.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/templates/web/seesomething/front/tips.html b/templates/web/seesomething/front/tips.html
deleted file mode 100644
index 9043ee4bd..000000000
--- a/templates/web/seesomething/front/tips.html
+++ /dev/null
@@ -1,5 +0,0 @@
-    <p>
-        If you are unsure about where the incident took place as you were on a
-        moving train or bus, then use the location of the start of your journey
-        and mention which bus or train you were on in your report.
-    </p>
diff --git a/templates/web/seesomething/header_extra.html b/templates/web/seesomething/header_extra.html
deleted file mode 100644
index 839e03dbe..000000000
--- a/templates/web/seesomething/header_extra.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src="[% version('/cobrands/seesomething/validation_rules.js') %]"></script>
diff --git a/templates/web/seesomething/index.html b/templates/web/seesomething/index.html
deleted file mode 100644
index 40780fba4..000000000
--- a/templates/web/seesomething/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %]
-
-[% PROCESS "maps/fms.html" %]
-[% INCLUDE 'header.html', title = '', bodyclass = 'mappage' %]
-
-<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
-<script type="text/javascript">
-var fixmystreet = fixmystreet || {};
-$.extend(fixmystreet, {
-    'latitude': 52.505241,
-    'longitude': -1.815285,
-    'zoom': 3,
-    'numZoomLevels': 5,
-    'zoomOffset': 13,
-    'map_type': ""
-});
-</script>
-<div id="map_box">
-    <div id="map"></div>
-    </div>
-
-    <div id="side-form">
-        <div id="report-a-problem-main">
-            [% form = PROCESS 'around/postcode_form.html' %]
-            [% form %]
-
-            [% IF error %]
-                <p class="form-error">[% error %]</p>
-            [% END %]
-
-            <div class="tablewrapper">
-                <div id="front-howto">
-                    [% INCLUDE 'index-steps.html' %]
-                </div>
-
-            </div>
-
-        </div>
-    </div>
-</form>
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/seesomething/js/translation_strings.html b/templates/web/seesomething/js/translation_strings.html
deleted file mode 100644
index 0ae40bf97..000000000
--- a/templates/web/seesomething/js/translation_strings.html
+++ /dev/null
@@ -1,15 +0,0 @@
-    translation_strings = {
-        detail: '[% loc('Please enter some details') | replace("'", "\\'") %]',
-        name: {
-            validName: '[% loc('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') | replace("'", "\\'") %]'
-        },
-        category: '[% loc('Please choose a transport category') | replace("'", "\\'") %]',
-        subcategory: '[% loc('Please choose an incident category') | replace("'", "\\'") %]',
-        rznvy: {
-            required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
-            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
-        },
-        email: {
-            email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
-        }
-    };
diff --git a/templates/web/seesomething/main_nav_items.html b/templates/web/seesomething/main_nav_items.html
deleted file mode 100644
index 0bfb9576a..000000000
--- a/templates/web/seesomething/main_nav_items.html
+++ /dev/null
@@ -1,3 +0,0 @@
-[%~ PROCESS navitem uri='/' label=loc('Report a problem') attrs='class="report-a-problem-btn"' ~%]
-
-[%~ PROCESS navitem uri='/faq' label=loc('Help') ~%]
diff --git a/templates/web/seesomething/report/display.html b/templates/web/seesomething/report/display.html
deleted file mode 100644
index 93b0048a2..000000000
--- a/templates/web/seesomething/report/display.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[%
-    INCLUDE 'header.html'
-        robots = 'index, nofollow',
-        bobyclass = 'mappage';
-%]
-
-Reports to this site are private
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html
deleted file mode 100644
index f18d4fd02..000000000
--- a/templates/web/seesomething/report/new/category.html
+++ /dev/null
@@ -1,15 +0,0 @@
-[% IF category_options.size ~%]
-    [% IF category;
-        category = category | lower;
-       END; ~%]
-    <label for='form_category' class="select">
-        [%~ loc('Category') ~%]
-    </label>[% =%]
-    <select name='category' data-theme="c" id='form_category' class="form-control">
-        [%~ FOREACH cat_op IN category_options ~%]
-        [% cat_op_lc = cat_op | lower =%]
-        <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc ~%]
-        >[% cat_op | html %]</option>
-        [%~ END =%]
-    </select>
-[%~ END ~%]
diff --git a/templates/web/seesomething/report/new/fill_in_details_form.html b/templates/web/seesomething/report/new/fill_in_details_form.html
deleted file mode 100644
index 21b51384b..000000000
--- a/templates/web/seesomething/report/new/fill_in_details_form.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<div id="report-a-problem-main">
-    <p>Click and drag on the map to reposition the pin.</p>
-    <h1>[% loc('Reporting a problem') %]</h1>
-
-
-    [% INCLUDE 'errors.html' %]
-    <fieldset>
-        <div id="problem_form">
-
-            [% INCLUDE 'report/new/form_heading.html' %]
-
-            [% IF field_errors.council %]
-                <p class='form-error'>[% field_errors.council %]</p>
-            [% END %]
-
-            <label for="form_detail">[% loc('Details') %]</label>
-            [% IF field_errors.detail %]
-                <p class='form-error'>[% field_errors.detail %]</p>
-            [% END %]
-            <textarea class="form-control" rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea>
-
-            [% IF js %]
-                <div id="form_category_row">
-                    <label for="form_category">[% loc('Transport Category') %]</label>
-                    <select class="form-control" name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select>
-                </div>
-            [% ELSE %]
-                [% IF category_options.size %]
-                    [% IF field_errors.category %]
-                        <p class='form-error'>[% field_errors.category %]</p>
-                    [% END %]
-
-                    [% PROCESS "report/new/category.html" %]
-                [% END %]
-            [% END %]
-
-            <div id="form_subcategory_row">
-                <label for="form_subcategory">[% loc('Incident Category') %]</label>
-                <select class="form-control" name="subcategory" id="form_subcategory" required>
-                    <option value="">-- Pick a category --</option>
-                    <option value="Smoking/other drugs">Smoking/other drugs</option>
-                    <option value="Drugs">Drugs</option>
-                    <option value="Anti-social behaviour">Anti-social behaviour</option>
-                    <option value="Loud music">Loud music</option>
-                    <option value="Damage">Damage</option>
-                    <option value="Feet on seats">Feet on seats</option>
-                    <option value="Other">Other</option>
-                </select>
-            </div>
-
-            [% 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 report.  Note that you can attach a maximum of 3 to this report (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 %]
-
-            <h2>Personal Details:</h2>
-
-            <label for="form_name">[% loc('Name (optional)') %]</label>
-            [% IF field_errors.name %]
-                <p class='form-error'>[% field_errors.name %]</p>
-            [% END %]
-
-            <input type="text" class="form-control form-focus-trigger validName js-form-name" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]">
-
-            <label for="form_email">[% loc('Your email (optional)') %]</label>
-            [% IF field_errors.email %]
-                <p class='form-error'>[% field_errors.email %]</p>
-            [% END %]
-            <input type="email" class="form-control" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]">
-
-
-
-            <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-            <input type="text" class="form-control" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-
-            <div class="form-txt-submit-box ">
-                <input class="green-btn" type="submit" id="submit_noname" name="submit_noname" value="[% loc('Submit') %]">
-            </div>
-
-        </div>
-    </fieldset>
-
-    [% IF partial_token %]
-        <input type="hidden" name="partial" value="[% partial_token.token %]">
-    [% END %]
-
-    <input type="hidden" name="submit_problem" value="1">
-</div>
diff --git a/templates/web/seesomething/set_body_class.html b/templates/web/seesomething/set_body_class.html
deleted file mode 100644
index b613706f2..000000000
--- a/templates/web/seesomething/set_body_class.html
+++ /dev/null
@@ -1 +0,0 @@
-[% bodyclass = ( bodyclass ? bodyclass : 'mappage' ) %]
diff --git a/templates/web/seesomething/site-name.html b/templates/web/seesomething/site-name.html
deleted file mode 100644
index 7a3ceec89..000000000
--- a/templates/web/seesomething/site-name.html
+++ /dev/null
@@ -1 +0,0 @@
-See Something, Say Something
diff --git a/templates/web/seesomething/tokens/confirm_problem.html b/templates/web/seesomething/tokens/confirm_problem.html
deleted file mode 100644
index 0a455434b..000000000
--- a/templates/web/seesomething/tokens/confirm_problem.html
+++ /dev/null
@@ -1,33 +0,0 @@
-[%
-
-    IF report.used_map;
-        PROCESS "maps/${map.type}.html";
-    END;
-
-    INCLUDE 'header.html',
-        title  => loc('Report created')
-        bodyclass => 'mappage',
-        robots => 'noindex,nofollow';
-%]
-
-
-[% IF report.used_map %]
-    [% map_html %]
-    </div>
-    <div id="map_sidebar">
-[% END %]
-
-        <div id="side">
-            <div id="report-a-problem-main">
-                <h1>Complete</h1>
-                <p>Your report has been sent. If you included contact details we may be in touch to follow up or request more details.</p>
-                <p>Thank you for saying something and making our transport safer.</p>
-                <p><img src="../cobrands/seesomething/images/btp-wmp-logos.png" alt="British Transport Police and the West Midlands Police" width="271" height="116"></p>
-            </div>
-        </div>
-
-[% IF report.used_map %]
-    </div>
-[% END %]
-
-[% INCLUDE 'footer.html' %]
-- 
cgit v1.2.3


From 9e96356d4f0fd42c4434c6ee9f9a47f90fb282fd Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 31 Mar 2017 14:45:51 +0100
Subject: Version 2.0.3.

---
 README.md                    | 8 ++++++--
 bin/site-specific-install.sh | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fc1288066..92f709805 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 2.0.2.
+Platform is now at version 2.0.3.
 
 ## Installation
 
@@ -45,7 +45,7 @@ web-based cross-browser testing tools for this project.
 
 ## Releases
 
-* In development
+* v2.0.3 (31st March 2017)
     - Front end improvements:
         - Add ability to make map full screen on mobile report pages. #1655
         - Move staff-only JavaScript to separate file. #1666
@@ -76,6 +76,8 @@ web-based cross-browser testing tools for this project.
         - Remove superfluous lists from Open311 JSON output. #1672
         - Upgrade to using Email::Sender. #1639
         - Fix bug if test run c. 55 hours before BST starts.
+        - Use lat/lon on inspection form if no local coordinates. #1676
+        - Improve translatability of various pages.
     - Development improvements:
         - Send open reports regardless of current state. #1334
         - Clarify ‘inspected’ behaviour. #1614
@@ -83,10 +85,12 @@ web-based cross-browser testing tools for this project.
         - Refactor main navigation into reusable blocks.
         - Add Problem->time_ago for pretty-printed duration.
         - Add `external_id` field to ResponsePriority.
+        - Forward on all bounces as bounces.
         - Use sender in From if From and To domains match. #1651
         - Refactor SendReport::Open311 to use cobrand hooks. #792
         - Do upload_dir check on start up, not each report. #1668
         - Make sure all tests can run offline. #1675
+        - Add ability to override Google Maps road style. #1676
 
 * v2.0.2 (3rd February 2017)
     - Front end changes:
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 07581ccb8..f3a81a07f 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:-v2.0.2}
+VERSION=${VERSION_OVERRIDE:-v2.0.3}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
 
-- 
cgit v1.2.3


From 880acad342b69720fe7acd54e0e7cede7036e4c7 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 3 Apr 2017 15:17:54 +0100
Subject: Upgrade Net::Facebook::Oauth2 to 0.10

0.09 was communicating with v2.2 of the Facebook API which was switched off
on 25th March 2017, so Facebook logins were no longer working.

Mock::Facebook was updated to correctly return JSON from /oauth/access_token,
to match the behaviour expected since v2.3 of the FB API.

Fixes #1681
---
 cpanfile           | 2 +-
 cpanfile.snapshot  | 6 +++---
 t/Mock/Facebook.pm | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cpanfile b/cpanfile
index 2907f7633..569136f84 100644
--- a/cpanfile
+++ b/cpanfile
@@ -74,7 +74,7 @@ requires 'MooX::Types::MooseLike';
 requires 'namespace::autoclean';
 requires 'Net::DNS::Resolver';
 requires 'Net::Domain::TLD', '1.75';
-requires 'Net::Facebook::Oauth2';
+requires 'Net::Facebook::Oauth2', '0.10';
 requires 'Net::OAuth';
 requires 'Net::Twitter::Lite::WithAPIv1_1';
 requires 'Path::Class';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
index c842dad99..4c3098bdb 100644
--- a/cpanfile.snapshot
+++ b/cpanfile.snapshot
@@ -4373,11 +4373,11 @@ DISTRIBUTIONS
       Carp 0
       ExtUtils::MakeMaker 0
       Storable 0
-  Net-Facebook-Oauth2-0.09
-    pathname: M/MA/MAMOD/Net-Facebook-Oauth2-0.09.tar.gz
+  Net-Facebook-Oauth2-0.10
+    pathname: M/MA/MAMOD/Net-Facebook-Oauth2-0.10.tar.gz
     provides:
       MyApp::Controller::Facebook undef
-      Net::Facebook::Oauth2 0.09
+      Net::Facebook::Oauth2 0.10
     requirements:
       Carp 0
       ExtUtils::MakeMaker 0
diff --git a/t/Mock/Facebook.pm b/t/Mock/Facebook.pm
index eb882af21..339eae536 100644
--- a/t/Mock/Facebook.pm
+++ b/t/Mock/Facebook.pm
@@ -20,14 +20,14 @@ has returns_email => (
 sub dispatch_request {
     my $self = shift;
 
-    sub (GET + /v2.2/dialog/oauth + ?*) {
+    sub (GET + /v2.8/dialog/oauth + ?*) {
         my ($self) = @_;
         return [ 200, [ 'Content-Type' => 'text/html' ], [ 'FB login page' ] ];
     },
 
-    sub (GET + /v2.2/oauth/access_token + ?*) {
+    sub (GET + /v2.8/oauth/access_token + ?*) {
         my ($self) = @_;
-        return [ 200, [ 'Content-Type' => 'text/plain' ], [ 'access_token=access_token&expires=never' ] ];
+        return [ 200, [ 'Content-Type' => 'application/json' ], [ '{"access_token": "access_token"}' ] ];
     },
 
     sub (GET + /me + ?fields=) {
-- 
cgit v1.2.3


From 430f17de7b4af94e52152bf11a30bd423a7a1c34 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Fri, 7 Apr 2017 14:07:08 +0100
Subject: Allow comma-separated contact emails in the admin

The report-sending code has allowed multiple emails for a long time, but the
admin wouldn't allow you to enter multiple emails for each contact.

Fixes mysociety/FixMyStreet-Commercial#835
---
 commonlib                                   |  2 +-
 perllib/FixMyStreet/App/Controller/Admin.pm |  7 ++++---
 t/app/controller/admin.t                    | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/commonlib b/commonlib
index 4d1ca3580..cb9fd0029 160000
--- a/commonlib
+++ b/commonlib
@@ -1 +1 @@
-Subproject commit 4d1ca3580a9eebc56e2e4ef800fdb45a8e2e3973
+Subproject commit cb9fd0029879d301f331e08c28aa287e504b2a22
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index d37e0b39c..c49cafe7d 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -7,7 +7,7 @@ BEGIN { extends 'Catalyst::Controller'; }
 use Path::Class;
 use POSIX qw(strftime strcoll);
 use Digest::SHA qw(sha1_hex);
-use mySociety::EmailUtil qw(is_valid_email);
+use mySociety::EmailUtil qw(is_valid_email is_valid_email_list);
 use mySociety::ArrayUtils;
 use DateTime::Format::Strptime;
 use List::Util 'first';
@@ -357,10 +357,11 @@ sub update_contacts : Private {
             }
         );
 
-        my $email = $self->trim( $c->get_param('email') );
+        my $email = $c->get_param('email');
+        $email =~ s/\s+//g;
         my $send_method = $c->get_param('send_method') || $contact->send_method || $contact->body->send_method || "";
         unless ( $send_method eq 'Open311' ) {
-            $errors{email} = _('Please enter a valid email') unless is_valid_email($email) || $email eq 'REFUSED';
+            $errors{email} = _('Please enter a valid email') unless is_valid_email_list($email) || $email eq 'REFUSED';
         }
 
         $contact->email( $email );
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index 2fdd8b74a..5f8abe5a6 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -206,7 +206,7 @@ subtest 'check contact creation' => sub {
 subtest 'check contact editing' => sub {
     $mech->get_ok('/admin/body/' . $body->id .'/test%20category');
 
-    $mech->submit_form_ok( { with_fields => { 
+    $mech->submit_form_ok( { with_fields => {
         email    => 'test2@example.com',
         note     => 'test2 note',
         non_public => undef,
@@ -218,7 +218,18 @@ subtest 'check contact editing' => sub {
     $mech->content_contains( 'Private:&nbsp;No' );
 
     $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
-    $mech->submit_form_ok( { with_fields => { 
+    $mech->submit_form_ok( { with_fields => {
+        email    => 'test2@example.com, test3@example.com',
+        note     => 'test3 note',
+    } } );
+
+    $mech->content_contains( 'test2@example.com,test3@example.com' );
+
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->content_contains( '<td><strong>test2@example.com,test3@example.com' );
+
+    $mech->get_ok('/admin/body/' . $body->id . '/test%20category');
+    $mech->submit_form_ok( { with_fields => {
         email    => 'test2@example.com',
         note     => 'test2 note',
         non_public => 'on',
-- 
cgit v1.2.3


From 4c8f35f69a2435492e1bd5f38d20211b6b492c22 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Mon, 10 Apr 2017 14:45:36 +0100
Subject: [CuidoMiCiudad] Update translations

---
 locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
index a4c029cf4..1817acae8 100644
--- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -1577,7 +1577,7 @@ 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 ""
-"Si dos o más organismos tienen la misma ubicación, FixMyStreet combina categorías de notificaciones idénticas en una sola entrada en\n"
+"Si dos o más organismos tienen la misma ubicación, CuidoMiCiudad combina categorías de notificaciones idénticas en una sola entrada en\n"
 "el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas."
 
 #: templates/web/base/questionnaire/completed.html:8
@@ -1641,7 +1641,7 @@ msgid ""
 "          when they are shown on the site. Enter the ID (number) of that user."
 msgstr ""
 "Si ha habilitado \"Open311 envío de actualizaciones\", debe identificar qué \n"
-"<strong>usuario</strong> de FixMyStreet aparece como creador de dichas actualizaciones\n"
+"<strong>usuario</strong> de CuidoMiCiudad aparece como creador de dichas actualizaciones\n"
 "en esta web. Introduzca el ID (número) del usuario."
 
 #: perllib/FixMyStreet/App/Controller/Contact.pm:133
@@ -2022,7 +2022,7 @@ msgstr "¡Casi hemos terminado! Lea su email&hellip;"
 
 #: templates/web/base/reports/index.html:24
 msgid "New <br>problems"
-msgstr "Nuevos <br>problemas"
+msgstr "Nuevos <br>reportes"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:259
 msgid "New body added"
@@ -2043,7 +2043,7 @@ msgstr "Nueva nota interna:"
 
 #: db/alert_types.pl:18 db/alert_types.pl:22
 msgid "New local problems on FixMyStreet"
-msgstr "Nuevos problemas locales en FixMyStreet"
+msgstr "Nuevos reportes locales en CuidoMiCiudad"
 
 #: templates/web/zurich/admin/report_edit-sdm.html:113
 msgid "New note to DM:"
@@ -2060,23 +2060,23 @@ msgstr "Prioridad nueva"
 
 #: db/alert_types.pl:38
 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
-msgstr "Nuevos problemas en {{COUNCIL}} para el barrio {{WARD}} en FixMyStreet"
+msgstr "Nuevos reportes en {{COUNCIL}} para el barrio {{WARD}} en CuidoMiCiudad"
 
 #: db/alert_types.pl:26 db/alert_types.pl:30
 msgid "New problems near {{POSTCODE}} on FixMyStreet"
-msgstr "Nuevos problemas cerca de {{POSTCODE}} En FixMyStreet"
+msgstr "Nuevos reportes cerca de {{POSTCODE}} En CuidoMiCiudad"
 
 #: db/alert_types.pl:10
 msgid "New problems on FixMyStreet"
-msgstr "Nuevos problemas en FixMyStreet"
+msgstr "Nuevos reportes en CuidoMiCiudad"
 
 #: db/alert_types.pl:34
 msgid "New problems to {{COUNCIL}} on FixMyStreet"
-msgstr "Nuevos problemas en {{COUNCIL}} en FixMyStreet"
+msgstr "Nuevos reportes en {{COUNCIL}} en CuidoMiCiudad"
 
 #: db/alert_types.pl:42
 msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
-msgstr "Nuevos problemas en los límites de {{NAME}} en FixMyStreet"
+msgstr "Nuevos reportes en los límites de {{NAME}} en CuidoMiCiudad"
 
 #: templates/web/zurich/admin/index-sdm.html:4
 msgid "New reports"
@@ -2288,7 +2288,7 @@ msgstr ""
 
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
-msgstr "Problemas<br>Antiguos / desconocidos"
+msgstr "Reportes<br>Antiguos / desconocidos"
 
 #: templates/web/base/admin/questionnaire.html:24
 msgid "Old state"
@@ -2296,11 +2296,11 @@ msgstr "Estado antiguo"
 
 #: templates/web/base/reports/index.html:28
 msgid "Older <br>fixed"
-msgstr "Antiguo <br>arreglado"
+msgstr "Reportes solucionados"
 
 #: templates/web/base/reports/index.html:25
 msgid "Older <br>problems"
-msgstr "Problemas <br>antiguos"
+msgstr "Reportes <br>antiguos"
 
 #: templates/web/base/reports/_list-filters.html:48
 msgid "Oldest"
@@ -2337,7 +2337,7 @@ msgstr "Código Open311  API "
 
 #: templates/web/base/open311/index.html:62
 msgid "Open311 API for the mySociety FixMyStreet server"
-msgstr "API Open311 para el servidor FixMyStreet de mySociety"
+msgstr "API Open311 para el servidor CuidoMiCiudad"
 
 #: templates/web/base/admin/open311-form-fields.html:34
 msgid "Open311 Jurisdiction"
@@ -2818,7 +2818,7 @@ msgstr "Problemas en el mapa"
 
 #: db/alert_types.pl:14
 msgid "Problems recently reported fixed on FixMyStreet"
-msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
+msgstr "Problemas recientemente notificados como arreglados en CuidoMiCiudad"
 
 #: templates/web/base/alert/_list.html:22
 msgid "Problems within %.1fkm of this location"
@@ -2984,7 +2984,7 @@ msgstr "Recientemente actualizado"
 
 #: 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 "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."
+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/report_blocks.html:48
 msgid "Remove flag"
@@ -3442,7 +3442,7 @@ msgid ""
 "          sent from your FixMyStreet installation."
 msgstr ""
 "Algunos puntos finales requieren una clave de <strong>API</strong> para indicar que las notificaciones provienen\n"
-"de tu sistema FixMyStreet."
+"de tu sistema CuidoMiCiudad."
 
 #: templates/web/base/alert/index.html:40
 msgid "Some photos of recent reports"
@@ -3742,7 +3742,7 @@ msgstr "Esa notificación no se puede ver en %s."
 
 #: perllib/FixMyStreet/App/Controller/Report.pm:131
 msgid "That report has been removed from FixMyStreet."
-msgstr "Esa notificación ha sido eliminada de FixMyStreet."
+msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad."
 
 #: templates/web/base/admin/contact-form.html:25
 msgid ""
@@ -3758,7 +3758,7 @@ msgid ""
 "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
 "            when sending reports to this body."
 msgstr ""
-"El <strong>destino</strong> es la URL del servicio al que FixMyStreet se conectará \n"
+"El <strong>destino</strong> es la URL del servicio al que CuidoMiCiudad se conectará \n"
 "cuando envíe notificaciones al organismo administrativo."
 
 #: templates/web/base/admin/open311-form-fields.html:27
@@ -3994,7 +3994,7 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cu
 
 #: templates/web/base/reports/index.html:10
 msgid "This is a summary of all reports on this site."
-msgstr "Este es un resumen de todos los informes en esta web."
+msgstr "Este es un resumen de todos los informes en CuidoMiCiudad."
 
 #: templates/web/base/report/new/form_report.html:56
 msgid "This pothole has been here for two months and…"
-- 
cgit v1.2.3


From efe6ac273fa3ec9edc48e7d196d59f2e9a82a224 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 12 Apr 2017 16:18:01 +0100
Subject: Don't error when devolved body, blank send methods

The check assumed that if a body was devolved, either the contact
or the body would have a send method. Instead, use a contact send
method if devolved and it exists, a body send method if it exists
or the fallback if neither. Fixes #1374.
---
 perllib/FixMyStreet/Cobrand/Default.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 6d9f38d78..ac70fff08 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -873,13 +873,11 @@ sub get_body_sender {
 
     # look up via category
     my $contact = $body->contacts->search( { category => $category } )->first;
-    if ( $body->can_be_devolved ) {
-        if ( $contact->send_method ) {
-            return { method => $contact->send_method, config => $contact, contact => $contact };
-        } else {
-            return { method => $body->send_method, config => $body, contact => $contact };
-        }
-    } elsif ( $body->send_method ) {
+    if ( $body->can_be_devolved && $contact->send_method ) {
+        return { method => $contact->send_method, config => $contact, contact => $contact };
+    }
+
+    if ( $body->send_method ) {
         return { method => $body->send_method, config => $body, contact => $contact };
     }
 
-- 
cgit v1.2.3


From cfe97d706f5cb7b3f3ca6d9227a872a7e50d97b2 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Apr 2017 13:13:23 +0100
Subject: Factor out shared admin template.

---
 templates/web/base/admin/report-category.html | 14 ++++++++++++++
 templates/web/base/admin/report_edit.html     | 16 ++--------------
 templates/web/base/report/_inspect.html       | 16 +---------------
 3 files changed, 17 insertions(+), 29 deletions(-)
 create mode 100644 templates/web/base/admin/report-category.html

diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html
new file mode 100644
index 000000000..ecb5f66f4
--- /dev/null
+++ b/templates/web/base/admin/report-category.html
@@ -0,0 +1,14 @@
+<select class="form-control" name="category" id="category">
+  [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
+    <optgroup label="[% loc('Existing category') %]">
+        <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
+    </optgroup>
+  [% END %]
+  [% IF categories.size %]
+    <optgroup label="[% loc('Available categories') %]">
+      [% FOREACH cat IN categories %]
+        <option[% ' selected' IF problem.category == cat %]>[% cat | html %]</option>
+      [% END %]
+    </optgroup>
+  [% END %]
+</select>
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index 911b1995a..3c8134b80 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -117,20 +117,8 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
     [% INCLUDE 'admin/state_groups_select.html' %]
 </li>
 <li><label class="inline-text" for="category">[% loc('Category:') %]</label>
-<select class="form-control" name="category" id="category">
-  [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
-  <optgroup label="[% loc('Existing category') %]">
-    <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
-  </optgroup>
-  [% END %]
-  [% IF categories.size %]
-    <optgroup label="[% loc('Available categories') %]">
-      [% FOREACH cat IN categories %]
-        <option[% ' selected' IF problem.category == cat %]>[% cat | html %]</option>
-      [% END %]
-    </optgroup>
-  [% END %]
-</select></li>
+    [% INCLUDE 'admin/report-category.html' %]
+</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>
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html
index d2ba1cc88..b75394abd 100644
--- a/templates/web/base/report/_inspect.html
+++ b/templates/web/base/report/_inspect.html
@@ -36,21 +36,7 @@
       <div class="inspect-section">
         <p>
           <label for="category">[% loc('Category') %]</label>
-            [%# XXX this is duplicated from admin/report_edit.html, should be refactored %]
-          <select name="category" id="category" class="form-control">
-            [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
-            <optgroup label="[% loc('Existing category') %]">
-              <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
-            </optgroup>
-            [% END %]
-            [% IF categories.size %]
-              <optgroup label="[% loc('Available categories') %]">
-                [% FOREACH cat IN categories %]
-                  <option[% ' selected' IF problem.category == cat %]>[% cat | html %]</option>
-                [% END %]
-              </optgroup>
-            [% END %]
-          </select>
+          [% INCLUDE 'admin/report-category.html' %]
         </p>
 
         [% FOREACH category IN categories %]
-- 
cgit v1.2.3


From 112ab20142f7f79d4ffff557b95c53406ad79bd9 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Apr 2017 14:29:56 +0100
Subject: Fix issue with categories with regex characters.

As the templates were using `grep`, they failed to match on a category
such as "Footpaths (right of way)". Changing the stash variables to be
hashes instead of lists makes checking for a key simpler. Fixes #1688.
---
 perllib/FixMyStreet/App/Controller/Admin.pm   | 5 +++--
 perllib/FixMyStreet/App/Controller/Around.pm  | 6 +++---
 perllib/FixMyStreet/App/Controller/My.pm      | 2 +-
 perllib/FixMyStreet/App/Controller/Report.pm  | 2 +-
 perllib/FixMyStreet/App/Controller/Reports.pm | 2 +-
 templates/web/base/admin/report-category.html | 2 +-
 templates/web/base/reports/_list-filters.html | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index c49cafe7d..1f3307710 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -733,7 +733,7 @@ sub report_edit : Path('report_edit') : Args(1) {
         }
     }
 
-    $c->stash->{categories} = $c->forward('categories_for_point');
+    $c->forward('categories_for_point');
 
     if ( $c->cobrand->moniker eq 'zurich' ) {
         my $done = $c->cobrand->admin_report_edit();
@@ -909,7 +909,8 @@ sub categories_for_point : Private {
     # Remove the "Pick a category" option
     shift @{$c->stash->{category_options}} if @{$c->stash->{category_options}};
 
-    return $c->stash->{category_options};
+    $c->stash->{categories} = $c->stash->{category_options};
+    $c->stash->{categories_hash} = { map { $_ => 1 } @{$c->stash->{category_options}} };
 }
 
 sub templates : Path('templates') : Args(0) {
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 96854b17b..1fe35d0a3 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -182,7 +182,7 @@ sub display_location : Private {
     my ( $on_map_all, $on_map, $nearby, $distance ) =
       FixMyStreet::Map::map_features( $c,
         latitude => $latitude, longitude => $longitude,
-        interval => $interval, categories => $c->stash->{filter_category},
+        interval => $interval, categories => [ keys %{$c->stash->{filter_category}} ],
         states => $c->stash->{filter_problem_states},
         order => $c->stash->{sort_order},
       );
@@ -264,8 +264,8 @@ sub check_and_stash_category : Private {
     my %categories_mapped = map { $_ => 1 } @categories;
 
     my $categories = [ $c->get_param_list('filter_category', 1) ];
-    my @valid_categories = grep { $_ && $categories_mapped{$_} } @$categories;
-    $c->stash->{filter_category} = \@valid_categories;
+    my %valid_categories = map { $_ => 1 } grep { $_ && $categories_mapped{$_} } @$categories;
+    $c->stash->{filter_category} = \%valid_categories;
 }
 
 =head2 /ajax
diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm
index ffcdf829d..77711f807 100644
--- a/perllib/FixMyStreet/App/Controller/My.pm
+++ b/perllib/FixMyStreet/App/Controller/My.pm
@@ -111,7 +111,7 @@ sub get_problems : Private {
     my $categories = [ $c->get_param_list('filter_category', 1) ];
     if ( @$categories ) {
         $params->{category} = $categories;
-        $c->stash->{filter_category} = $categories;
+        $c->stash->{filter_category} = { map { $_ => 1 } @$categories };
     }
 
     my $rows = 50;
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index fe7576893..ad2702460 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -306,7 +306,7 @@ sub inspect : Private {
     my $problem = $c->stash->{problem};
     my $permissions = $c->stash->{_permissions};
 
-    $c->stash->{categories} = $c->forward('/admin/categories_for_point');
+    $c->forward('/admin/categories_for_point');
     $c->stash->{report_meta} = { map { $_->{name} => $_ } @{ $c->stash->{problem}->get_extra_fields() } };
 
     my %category_body = map { $_->category => $_->body_id } map { $_->contacts->all } values %{$problem->bodies};
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index 69a2ddb0f..bb5b13b61 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -137,7 +137,7 @@ sub ward : Path : Args(2) {
     } )->all;
     @categories = map { $_->category } @categories;
     $c->stash->{filter_categories} = \@categories;
-    $c->stash->{filter_category} = [ $c->get_param_list('filter_category', 1) ];
+    $c->stash->{filter_category} = { map { $_ => 1 } $c->get_param_list('filter_category', 1) };
 
     my $pins = $c->stash->{pins};
 
diff --git a/templates/web/base/admin/report-category.html b/templates/web/base/admin/report-category.html
index ecb5f66f4..1e39236d7 100644
--- a/templates/web/base/admin/report-category.html
+++ b/templates/web/base/admin/report-category.html
@@ -1,5 +1,5 @@
 <select class="form-control" name="category" id="category">
-  [% IF NOT problem.category OR NOT categories.grep(problem.category).size %]
+  [% IF NOT problem.category OR NOT categories_hash.${problem.category} %]
     <optgroup label="[% loc('Existing category') %]">
         <option selected value="[% problem.category | html %]">[% (problem.category OR '-') | html %]</option>
     </optgroup>
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index ce4666156..e657e0375 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -19,7 +19,7 @@
   [% 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 | html %]"[% ' selected' IF filter_category.grep(cat).size %]>
+            <option value="[% cat | html %]"[% ' selected' IF filter_category.$cat %]>
                 [% cat | html %]
             </option>
         [% END %]
-- 
cgit v1.2.3


From ef6ffbdbfa562dca1825a0abc06afb0e52509737 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Apr 2017 16:48:57 +0100
Subject: On /reports maps, only include reports in view.

Update the reports with a bounding box, similar to on around pages.
This is made slightly trickier because we don't want to do anything
on page load (we already have the pins), we need to reload when the
zoom changes, and we don't want the strategy to get confused by its
first redraw, e.g. on pin hover, We also need to turn off the zoom-
to-bounds if we've got a bounding box in the URL.
---
 perllib/FixMyStreet/App/Controller/Reports.pm |  6 +++++
 web/js/map-OpenLayers.js                      | 38 +++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index bb5b13b61..ed851f71f 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -430,6 +430,12 @@ sub load_and_group_problems : Private {
         $problems = $problems->to_body($c->stash->{body});
     }
 
+    if (my $bbox = $c->get_param('bbox')) {
+        my ($min_lon, $min_lat, $max_lon, $max_lat) = split /,/, $bbox;
+        $where->{latitude} = { '>=', $min_lat, '<', $max_lat };
+        $where->{longitude} = { '>=', $min_lon, '<', $max_lon };
+    }
+
     $problems = $problems->search(
         $where,
         $filter
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 40539f385..b53246279 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -215,14 +215,21 @@ var fixmystreet = fixmystreet || {};
         }
     };
 
+    /* Make sure pins aren't going to reload just because we're zooming out,
+     * we already have the pins when the page loaded */
     function zoomToBounds(bounds) {
         if (!bounds) { return; }
+        fixmystreet.markers.strategies[0].deactivate();
         var center = bounds.getCenterLonLat();
         var z = fixmystreet.map.getZoomForExtent(bounds);
         if ( z < 13 && $('html').hasClass('mobile') ) {
             z = 13;
         }
         fixmystreet.map.setCenter(center, z);
+        // Reactivate the strategy and make it think it's done an update
+        fixmystreet.markers.strategies[0].activate();
+        fixmystreet.markers.strategies[0].calculateBounds();
+        fixmystreet.markers.strategies[0].resolution = fixmystreet.map.getResolution();
     }
 
     function sidebar_highlight(problem_id) {
@@ -391,7 +398,10 @@ var fixmystreet = fixmystreet || {};
                         f.geometry = new_geometry;
                         this.removeAllFeatures();
                         this.addFeatures([f]);
-                        zoomToBounds(extent);
+                        var qs = parse_query_string();
+                        if (!qs.bbox) {
+                            zoomToBounds(extent);
+                        }
                     } else {
                         fixmystreet.map.removeLayer(this);
                     }
@@ -478,8 +488,13 @@ var fixmystreet = fixmystreet || {};
                 format: new OpenLayers.Format.FixMyStreet()
             });
         }
-        if (fixmystreet.page == 'reports' || fixmystreet.page == 'my') {
+        if (fixmystreet.page == 'reports') {
+            pin_layer_options.strategies = [ new OpenLayers.Strategy.FixMyStreetRefreshOnZoom() ];
+        }
+        if (fixmystreet.page == 'my') {
             pin_layer_options.strategies = [ new OpenLayers.Strategy.FixMyStreetFixed() ];
+        }
+        if (fixmystreet.page == 'reports' || fixmystreet.page == 'my') {
             pin_layer_options.protocol = new OpenLayers.Protocol.FixMyStreet({
                 url: fixmystreet.original.href.split('?')[0] + '?ajax=1',
                 format: new OpenLayers.Format.FixMyStreet()
@@ -781,6 +796,25 @@ OpenLayers.Strategy.FixMyStreet = OpenLayers.Class(OpenLayers.Strategy.BBOX, {
     }
 });
 
+/* This strategy will call for updates whenever the zoom changes,
+ * unlike the parent which only will if new area is included. It
+ * also does not update on load, as we already have the data. */
+OpenLayers.Strategy.FixMyStreetRefreshOnZoom = OpenLayers.Class(OpenLayers.Strategy.FixMyStreet, {
+    resFactor: 1.5,
+    activate: function() {
+        var activated = OpenLayers.Strategy.prototype.activate.call(this);
+        if (activated) {
+            this.layer.events.on({
+                "moveend": this.update,
+                "refresh": this.update,
+                "visibilitychanged": this.update,
+                scope: this
+            });
+        }
+        return activated;
+    }
+});
+
 /* Copy of Strategy.Fixed, but with no initial load */
 OpenLayers.Strategy.FixMyStreetFixed = OpenLayers.Class(OpenLayers.Strategy.Fixed, {
     activate: function() {
-- 
cgit v1.2.3


From a085b63ce09f87e83b75cda9b9cd08aadfe75d61 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Thu, 13 Apr 2017 22:22:10 +0100
Subject: Version 2.0.4.

---
 README.md                    | 12 +++++++++++-
 bin/site-specific-install.sh |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 92f709805..b0958157b 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 2.0.3.
+Platform is now at version 2.0.4.
 
 ## Installation
 
@@ -45,6 +45,16 @@ web-based cross-browser testing tools for this project.
 
 ## Releases
 
+* v2.0.4 (13th April 2017)
+    - Front end improvements:
+        - On /reports maps, only include reports in view. #1689
+    - Admin improvements:
+        - Allow comma-separated contact emails in the admin. #1683
+    - Bugfixes:
+        - Upgrade Facebook 3rd party library to fix Facebook login. #1681
+        - Don't error when devolved body, blank send methods. #1374
+        - Fix issue with categories with regex characters. #1688
+
 * v2.0.3 (31st March 2017)
     - Front end improvements:
         - Add ability to make map full screen on mobile report pages. #1655
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index f3a81a07f..d780b7f94 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:-v2.0.3}
+VERSION=${VERSION_OVERRIDE:-v2.0.4}
 
 PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
 
-- 
cgit v1.2.3